diff --git a/patches/api-remapped/0002-Purpur-config-files.patch b/patches/api-remapped/0002-Purpur-config-files.patch
index fd9045d88..665dcaa68 100644
--- a/patches/api-remapped/0002-Purpur-config-files.patch
+++ b/patches/api-remapped/0002-Purpur-config-files.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f55ae8275c297c4c86215fba8d7197ffe9715879..0888165f2327bad2125d9cbe9b72e3282d44e072 100644
+index e88b47a838dc472ad64271a518ee1789f7be19fa..cdfbeda5ed988a3d03d4fc616904e5a2d32f793f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1614,6 +1614,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1606,6 +1606,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
-         // Tuinity end - add config to timings report
+         // Paper end
  
 +        // Purpur start
 +        @NotNull
diff --git a/patches/api-remapped/0007-AFK-API.patch b/patches/api-remapped/0007-AFK-API.patch
index bc1756663..c09b73189 100644
--- a/patches/api-remapped/0007-AFK-API.patch
+++ b/patches/api-remapped/0007-AFK-API.patch
@@ -81,10 +81,10 @@ index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 27848ad0eee667e515685a5f1cef3e9bfc7a3f53..09729abc27b6cb3458e19af24137bbbc6e5cb63e 100644
+index a4b236d75e77176a163094edd31f81725bbf4eca..ebb94111b851396832ecf5f84f4e829a4fe0b62e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2139,4 +2139,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2099,4 +2099,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end
diff --git a/patches/api-remapped/0008-Bring-back-server-name.patch b/patches/api-remapped/0008-Bring-back-server-name.patch
index e49a45944..2d83cdd77 100644
--- a/patches/api-remapped/0008-Bring-back-server-name.patch
+++ b/patches/api-remapped/0008-Bring-back-server-name.patch
@@ -25,10 +25,10 @@ index e8414592b3afeb1e5db2b817b8fb7c13e073b9aa..281c5a72cf59dd5cb3dee47541641483
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0888165f2327bad2125d9cbe9b72e3282d44e072..eebaee3f3e01f39c0378cc89381eb97d95f31152 100644
+index cdfbeda5ed988a3d03d4fc616904e5a2d32f793f..1794168c632d3814835f7f8b361ba69d59fd303c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1736,4 +1736,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1728,4 +1728,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      io.papermc.paper.datapack.DatapackManager getDatapackManager();
      // Paper end
diff --git a/patches/api-remapped/0011-Lagging-threshold.patch b/patches/api-remapped/0011-Lagging-threshold.patch
index b5636be5b..724b127c2 100644
--- a/patches/api-remapped/0011-Lagging-threshold.patch
+++ b/patches/api-remapped/0011-Lagging-threshold.patch
@@ -24,10 +24,10 @@ index 281c5a72cf59dd5cb3dee47541641483d434aeb0..a60c8bd89d14e47d3243307241458e90
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index eebaee3f3e01f39c0378cc89381eb97d95f31152..f24d00951cd6951023f1ff34312ae0438107fc22 100644
+index 1794168c632d3814835f7f8b361ba69d59fd303c..5ac834f0dc775d5877a7dd309cff549ec06310e9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1744,5 +1744,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1736,5 +1736,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      String getServerName();
diff --git a/patches/api-remapped/0016-Player-invulnerabilities.patch b/patches/api-remapped/0016-Player-invulnerabilities.patch
index d7c53b52a..6ef8db412 100644
--- a/patches/api-remapped/0016-Player-invulnerabilities.patch
+++ b/patches/api-remapped/0016-Player-invulnerabilities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 09729abc27b6cb3458e19af24137bbbc6e5cb63e..d6b6508fd7ab245f657be262c54ae6dfa20415e7 100644
+index ebb94111b851396832ecf5f84f4e829a4fe0b62e..77f075f7b87dd750a6cc89be7c6fc41afa05507d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2159,5 +2159,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2119,5 +2119,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();
diff --git a/patches/api-remapped/0032-Fix-javadoc-warnings-missing-param-and-return.patch b/patches/api-remapped/0032-Fix-javadoc-warnings-missing-param-and-return.patch
index b712f8088..e6978a9d8 100644
--- a/patches/api-remapped/0032-Fix-javadoc-warnings-missing-param-and-return.patch
+++ b/patches/api-remapped/0032-Fix-javadoc-warnings-missing-param-and-return.patch
@@ -520,7 +520,7 @@ index 3afd5f5c0208a4ee93b5dbfc2aab2b9d2e8a7544..7838731e0e16bdccfb79e74ceb64148f
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f24d00951cd6951023f1ff34312ae0438107fc22..3ee71225eb67ec728b414a8cdc0570d48d5603e3 100644
+index 5ac834f0dc775d5877a7dd309cff549ec06310e9..31b776d35786a932eb912010778ff83b35244f6d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1579,6 +1579,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -994,10 +994,10 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..e8027e1d505dda6effbb1698550016e8
  
          NORMAL(false),
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d6b6508fd7ab245f657be262c54ae6dfa20415e7..25252bad38ca35b81b225b57c4b6ce77ad6de166 100644
+index 77f075f7b87dd750a6cc89be7c6fc41afa05507d..700aa4b70b0f540aefae9f7db807214c52422d20 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1961,6 +1961,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1921,6 +1921,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void resetCooldown();
  
      /**
@@ -1006,7 +1006,7 @@ index d6b6508fd7ab245f657be262c54ae6dfa20415e7..25252bad38ca35b81b225b57c4b6ce77
       * @return the client option value of the player
       */
      @NotNull
-@@ -2000,6 +2002,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1960,6 +1962,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      // Paper end
  
      // Spigot start
diff --git a/patches/api-remapped/0038-Conflict-on-change-for-adventure-deprecations.patch b/patches/api-remapped/0038-Conflict-on-change-for-adventure-deprecations.patch
index 0cbe2e1b8..3aadbae90 100644
--- a/patches/api-remapped/0038-Conflict-on-change-for-adventure-deprecations.patch
+++ b/patches/api-remapped/0038-Conflict-on-change-for-adventure-deprecations.patch
@@ -72,7 +72,7 @@ index a60c8bd89d14e47d3243307241458e907249a99b..194261bf20bb727d207a2429fa59abf0
          return server.getShutdownMessage();
      }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 3ee71225eb67ec728b414a8cdc0570d48d5603e3..a7fcd00ae37f9a2026759642562b1059c9dd9526 100644
+index 31b776d35786a932eb912010778ff83b35244f6d..8d3c9a355bea2b217f69f6eb70e0962a370e09b8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -250,7 +250,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -170,7 +170,7 @@ index 6ea9b54d95d80070c01a612c0ce2ab37f0b4ad41..fe9ec9cb7875df4a40d1c4155e13cca9
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 25252bad38ca35b81b225b57c4b6ce77ad6de166..9f289576d97c3406d506d3f4fa7287bc74e5b425 100644
+index 700aa4b70b0f540aefae9f7db807214c52422d20..0fb3b5a9ee1cc53b69b6d89766080936ea601312 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -72,7 +72,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api-remapped/0042-Flying-Fall-Damage-API.patch b/patches/api-remapped/0042-Flying-Fall-Damage-API.patch
index 890534c38..388129ea0 100644
--- a/patches/api-remapped/0042-Flying-Fall-Damage-API.patch
+++ b/patches/api-remapped/0042-Flying-Fall-Damage-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9f289576d97c3406d506d3f4fa7287bc74e5b425..df1da8a7dec072ddc33a884973bcad67152576fe 100644
+index 0fb3b5a9ee1cc53b69b6d89766080936ea601312..2d849d0b63d4fc5faa439bad6b9448e3200c26fd 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2185,5 +2185,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2145,5 +2145,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param invulnerableTicks Invulnerable ticks remaining
       */
      void setSpawnInvulnerableTicks(int invulnerableTicks);
diff --git a/patches/removed/1.17/.gitkeep b/patches/removed/1.17/.gitkeep
deleted file mode 100644
index d2cc6ea22..000000000
--- a/patches/removed/1.17/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-this is where we will put patches that are no longer needed in 1.17 or have to many merge conflicts and will be dealt with later
diff --git a/patches/server-unmapped/0093-Populator-seed-controls.patch b/patches/removed/1.17/0093-Populator-seed-controls.patch
similarity index 99%
rename from patches/server-unmapped/0093-Populator-seed-controls.patch
rename to patches/removed/1.17/0093-Populator-seed-controls.patch
index 675d1f145..d69dd70d4 100644
--- a/patches/server-unmapped/0093-Populator-seed-controls.patch
+++ b/patches/removed/1.17/0093-Populator-seed-controls.patch
@@ -3,6 +3,7 @@ From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 18 Jul 2020 11:27:43 -0500
 Subject: [PATCH] Populator seed controls
 
+1.17: add back with tuinity
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
 index 5e672a0660d0aceffcdb26d185590ca18aa4f023..4b171a2a60e24947e884f8988920f335bd99a471 100644
diff --git a/patches/server-unmapped/0135-Origami-Fix-ProtocolLib-issues-on-Java-15.patch b/patches/removed/1.17/0135-Origami-Fix-ProtocolLib-issues-on-Java-15.patch
similarity index 99%
rename from patches/server-unmapped/0135-Origami-Fix-ProtocolLib-issues-on-Java-15.patch
rename to patches/removed/1.17/0135-Origami-Fix-ProtocolLib-issues-on-Java-15.patch
index 158f2947e..0cc11a6e1 100644
--- a/patches/server-unmapped/0135-Origami-Fix-ProtocolLib-issues-on-Java-15.patch
+++ b/patches/removed/1.17/0135-Origami-Fix-ProtocolLib-issues-on-Java-15.patch
@@ -3,6 +3,7 @@ From: Phoenix616 <max@themoep.de>
 Date: Mon, 19 Oct 2020 17:20:53 +0100
 Subject: [PATCH] Origami - Fix ProtocolLib issues on Java 15
 
+1.17: add back with tuinity
 
 diff --git a/src/main/java/net/minecraft/network/NetworkManager.java b/src/main/java/net/minecraft/network/NetworkManager.java
 index b6c0ef0df93f0350fa70e857e06d79ae34d7d4b1..1dce5d3b1e994a060067de4901912dd5a9be7e15 100644
diff --git a/patches/server-unmapped/0209-Optimize-collisions.patch b/patches/removed/1.17/0209-Optimize-collisions.patch
similarity index 99%
rename from patches/server-unmapped/0209-Optimize-collisions.patch
rename to patches/removed/1.17/0209-Optimize-collisions.patch
index 041659e83..bd8f991f0 100644
--- a/patches/server-unmapped/0209-Optimize-collisions.patch
+++ b/patches/removed/1.17/0209-Optimize-collisions.patch
@@ -3,6 +3,7 @@ From: DoctaEnkoda <bierquejason@gmail.com>
 Date: Tue, 11 May 2021 00:28:13 +0200
 Subject: [PATCH] Optimize collisions
 
+1.17: add back with tuinity
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
 index 7d0c5d28597c51d332146a82df06ba519711f836..fbc7f3e489be0ac5939af29a9aef75a56c38eb4a 100644
diff --git a/patches/server-unmapped/0002-Rebrand.patch b/patches/server-unmapped/0002-Rebrand.patch
index accedd374..1572bfa58 100644
--- a/patches/server-unmapped/0002-Rebrand.patch
+++ b/patches/server-unmapped/0002-Rebrand.patch
@@ -5,15 +5,15 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/pom.xml b/pom.xml
-index 642ee96ead8176f5c5a811946b050f4fa5dab6e2..3ef0a08b7a38040e43670d18dc6c5542f9fbb9bb 100644
+index 1a9204c869dd36e80932b1366352db15ebd70723..8f4c8614df78c3b07818c293abf7cd5d2ce3da6a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -39,8 +39,10 @@
  
      <dependencies>
          <dependency>
--            <groupId>com.tuinity</groupId>
--            <artifactId>tuinity-api</artifactId>
+-            <groupId>com.destroystokyo.paper</groupId>
+-            <artifactId>paper-api</artifactId>
 +            <!-- Purpur start - our "upstream" is Paper (not Tuinity), so this is necessary for DependencyLoading.kt to work properly -->
 +            <groupId>net.pl3x.purpur</groupId>
 +            <artifactId>purpur-api</artifactId>
@@ -21,7 +21,7 @@ index 642ee96ead8176f5c5a811946b050f4fa5dab6e2..3ef0a08b7a38040e43670d18dc6c5542
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
-@@ -195,6 +197,14 @@
+@@ -185,6 +187,14 @@
          </dependency>
      </dependencies>
  
@@ -35,8 +35,8 @@ index 642ee96ead8176f5c5a811946b050f4fa5dab6e2..3ef0a08b7a38040e43670d18dc6c5542
 +
      <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
      <build>
-         <finalName>tuinity-${minecraft.version}</finalName>
-@@ -400,8 +410,15 @@
+         <finalName>paper-${minecraft.version}</finalName>
+@@ -390,8 +400,15 @@
                      <dependency>
                          <groupId>org.eclipse.jdt</groupId>
                          <artifactId>ecj</artifactId>
@@ -67,36 +67,36 @@ index ad87b575a0261200b280884e054a59e3ce59c41c..e56ebeaaa12494817d31099eed54ef2c
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java
-index 3bc5cd1e53dd7c94b948e7f57f0dc8e073e349b0..87891161f5b06bb8be0e2016b490484e6daca9d7 100644
+index a0f53c9eff04a40780b3ba568dbfc5bbe9bd8504..87891161f5b06bb8be0e2016b490484e6daca9d7 100644
 --- a/src/main/java/net/minecraft/server/EULA.java
 +++ b/src/main/java/net/minecraft/server/EULA.java
 @@ -72,7 +72,7 @@ public class EULA {
                      Properties properties = new Properties();
  
                      properties.setProperty("eula", "false");
--                    properties.store(outputstream, "By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).");  // Paper - fix lag; // Tuinity - Tacos are disgusting
+-                    properties.store(outputstream, "By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).\nYou also agree that tacos are tasty, and the best food in the world.");  // Paper - fix lag;
 +                    properties.store(outputstream, "By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).\nYou also agree that tacos are tasty, and the best food in the world.");  // Paper - fix lag; // Tuinity - Tacos are disgusting // Purpur - no they're not
                  } catch (Throwable throwable1) {
                      throwable = throwable1;
                      throw throwable1;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6f90a4182e008b49a4b3328e569311382e4bec0d..b02affc621f1960302d8d40426e676a319b0c227 100644
+index bf80e870e6a2a6fe1d4ae1bea355bcd7a0735d3b..67988051844898e7ce3c60135c7bc9711be41102 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1650,7 +1650,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1583,7 +1583,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
--        return "Tuinity"; // Tuinity //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+-        return "Paper"; //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
 +        return "Purpur"; // Purpur // Tuinity // Paper // Spigot // CraftBukkit
      }
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 3713a110a64fa686e785b9789c33dd09cacc2f48..10dcc34738378d416d4fae1875bcc26796e9d67f 100644
+index 1929b992be3aeaa37c7b04c458f0ee41a60c692e..5090a7b89d1a197a5d33c508542a1dd1c5843517 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -275,11 +275,12 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -274,11 +274,12 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
              DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
              // Spigot start
@@ -237,14 +237,14 @@ index 0000000000000000000000000000000000000000..cabfcebf9f944f7a2a2a1cffc7401435
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 507c5255542ba1b958470b4db2c35b1b0b779f17..967473b7109dc78b1b682c342929e40854b2517c 100644
+index cebecee640ed5a7fc2b978e00ff7eb012228267d..81972c31961adde94c6878ec38373a864c4d6285 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
--    private final String serverName = "Tuinity"; // Paper // Tuinity
+-    private final String serverName = "Paper"; // Paper
 +    private final String serverName = "Purpur"; // Paper // Tuinity // Purpur
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
@@ -263,749 +263,15 @@ index 6cb8608f8238c4a8c346b92ba672c8cc1c0cbcc4..3fa4d18d7a1e2d351fbe8e02d1e74958
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 001b1e5197eaa51bfff9031aa6c69876c9a47960..13b98439320ac1401a920c01d7cf5a4b3a23deff 100644
+index 674096cab190d62622f9947853b056f57d43a2a5..13b98439320ac1401a920c01d7cf5a4b3a23deff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -11,7 +11,7 @@ public final class Versioning {
      public static String getBukkitVersion() {
          String result = "Unknown-Version";
  
--        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.tuinity/tuinity-api/pom.properties"); // Tuinity
+-        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.destroystokyo.paper/paper-api/pom.properties");
 +        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/net.pl3x.purpur/purpur-api/pom.properties"); // Tuinity // Purpur
          Properties properties = new Properties();
  
          if (stream != null) {
-diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png
-index 1e6ee83b1a207eca59d82b25c06895ce894e8173..35ae7a94cebd4a9a16fc9112ccc248fa3cac5f32 100644
-GIT binary patch
-literal 17292
-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
-SDfV^%0000<MNUMnLSTXhlS0b?
-
-literal 23418
-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
-
diff --git a/patches/server-unmapped/0003-Purpur-config-files.patch b/patches/server-unmapped/0003-Purpur-config-files.patch
index 32cb61293..ede000683 100644
--- a/patches/server-unmapped/0003-Purpur-config-files.patch
+++ b/patches/server-unmapped/0003-Purpur-config-files.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 52c0ab1ce46e1f3233ef746d9bc699356fa9fae4..4d8740678049aa749b42618470e9cc838555528d 100644
+index dee00aac05f1acf050f05d4db557a08dd0f301c8..4d8740678049aa749b42618470e9cc838555528d 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
 @@ -593,7 +593,7 @@ public class Metrics {
              boolean logFailedRequests = config.getBoolean("logFailedRequests", false);
              // Only start Metrics, if it's enabled in the config
              if (config.getBoolean("enabled", true)) {
--                Metrics metrics = new Metrics("Tuinity", serverUUID, logFailedRequests, Bukkit.getLogger()); // Tuinity - we have our own bstats page
+-                Metrics metrics = new Metrics("Paper", serverUUID, logFailedRequests, Bukkit.getLogger());
 +                Metrics metrics = new Metrics("Purpur", serverUUID, logFailedRequests, Bukkit.getLogger()); // Purpur
  
                  metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
@@ -22,7 +22,7 @@ index 52c0ab1ce46e1f3233ef746d9bc699356fa9fae4..4d8740678049aa749b42618470e9cc83
  
                  metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
 -                metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() || PaperConfig.isProxyOnlineMode() ? "online" : "offline"));
--                metrics.addCustomChart(new Metrics.SimplePie("tuinity_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown")); // Tuinity - we have our own bstats page
+-                metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown"));
 +                metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : (PaperConfig.isProxyOnlineMode() ? "bungee" : "offline"))); // Purpur
 +                metrics.addCustomChart(new Metrics.SimplePie("purpur_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown")); // Purpur
  
@@ -45,7 +45,7 @@ index 7acf077bc131af718c7548cc29deef558c04e463..10126cb1c3efa2e6c84f20c0da701a13
              config.save(CONFIG_FILE);
          } catch (IOException ex) {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 10dcc34738378d416d4fae1875bcc26796e9d67f..69888acd1932fd896245e77ce58b53b8cdaf202c 100644
+index 5090a7b89d1a197a5d33c508542a1dd1c5843517..f9a9bf683bad6957fe1e7987b83c0278ba5379f8 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -212,6 +212,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -65,21 +65,26 @@ index 10dcc34738378d416d4fae1875bcc26796e9d67f..69888acd1932fd896245e77ce58b53b8
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
          // Paper end
 diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
-index cb8064df7e9f1b8b4d4292486e2193680d83663c..22d91a970c7376aa6349bb6cd9cb174e89bc8a09 100644
+index f7f593a9e58b537109fa6ca1c783f6614f4bfad5..bb01bbee04caafbe41435835e79bc699c3d96d46 100644
 --- a/src/main/java/net/minecraft/world/level/World.java
 +++ b/src/main/java/net/minecraft/world/level/World.java
-@@ -155,6 +155,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -154,6 +154,12 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+     public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
      public final ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
  
-     public final com.tuinity.tuinity.config.TuinityConfig.WorldConfig tuinityConfig; // Tuinity - Server Config
++<<<<<<< HEAD
++=======
++    public final com.tuinity.tuinity.config.TuinityConfig.WorldConfig tuinityConfig; // Tuinity - Server Config
 +    public final net.pl3x.purpur.PurpurWorldConfig purpurConfig; // Purpur
- 
++
++>>>>>>> f1ef523c0 (Purpur config files)
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
      public static BlockPosition lastPhysicsProblem; // Spigot
-@@ -254,6 +255,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+     private org.spigotmc.TickLimiter entityLimiter;
+@@ -194,6 +200,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+         this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.WorldDataServer) worlddatamutable).getName()); // Spigot
          this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((net.minecraft.world.level.storage.WorldDataServer) worlddatamutable).getName(), this.spigotConfig); // Paper
          this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this, executor) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
-         this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConfig(((net.minecraft.world.level.storage.WorldDataServer)worlddatamutable).getName()); // Tuinity - Server Config
 +        this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((((net.minecraft.world.level.storage.WorldDataServer)worlddatamutable).getName())); // Purpur
          this.generator = gen;
          this.world = new CraftWorld((WorldServer) this, gen, env);
@@ -357,26 +362,30 @@ index 0000000000000000000000000000000000000000..536955124afaec5c8a070249c7432cb9
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 967473b7109dc78b1b682c342929e40854b2517c..e0a11fe20a38e52ed008f9389ed7218825a8ee27 100644
+index 81972c31961adde94c6878ec38373a864c4d6285..65ce132f0584abfb2d8496f1a7ea4a987a42ad94 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -881,6 +881,7 @@ public final class CraftServer implements Server {
+@@ -880,6 +880,11 @@ public final class CraftServer implements Server {
+ 
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
-         com.tuinity.tuinity.config.TuinityConfig.init((File) console.options.valueOf("tuinity-settings")); // Tuinity - Server Config
++<<<<<<< HEAD
++=======
++        com.tuinity.tuinity.config.TuinityConfig.init((File) console.options.valueOf("tuinity-settings")); // Tuinity - Server Config
 +        net.pl3x.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
++>>>>>>> f1ef523c0 (Purpur config files)
          for (WorldServer world : console.getWorlds()) {
              world.worldDataServer.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -916,6 +917,7 @@ public final class CraftServer implements Server {
+@@ -914,6 +919,7 @@ public final class CraftServer implements Server {
+             }
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
-             world.tuinityConfig.init(); // Tuinity - Server Config
 +            world.purpurConfig.init(); // Purpur
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -934,6 +936,7 @@ public final class CraftServer implements Server {
+@@ -932,6 +938,7 @@ public final class CraftServer implements Server {
          reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -384,10 +393,20 @@ index 967473b7109dc78b1b682c342929e40854b2517c..e0a11fe20a38e52ed008f9389ed72188
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2384,6 +2387,18 @@ public final class CraftServer implements Server {
+@@ -2371,6 +2378,29 @@ public final class CraftServer implements Server {
+             return com.destroystokyo.paper.PaperConfig.config;
          }
-         // Tuinity end - add config to timings report
  
++<<<<<<< HEAD
++=======
++        // Tuinity start - add config to timings report
++        @Override
++        public YamlConfiguration getTuinityConfig()
++        {
++            return com.tuinity.tuinity.config.TuinityConfig.config;
++        }
++        // Tuinity end - add config to timings report
++
 +        // Purpur start
 +        @Override
 +        public YamlConfiguration getPurpurConfig() {
@@ -400,16 +419,17 @@ index 967473b7109dc78b1b682c342929e40854b2517c..e0a11fe20a38e52ed008f9389ed72188
 +        }
 +        // Purpur end
 +
++>>>>>>> f1ef523c0 (Purpur config files)
          @Override
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index fbeca329f62325aa479f968e7f0f04cde341a009..424d55f51a36d9033db3dfbf2f7a86749b0e3b91 100644
+index ecd1f0784493dfc758483b7912ce086c3b0d7aa0..e34f27c6782b049d96de20e4acec1325bd97a26a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -154,6 +154,14 @@ public class Main {
+@@ -147,6 +147,14 @@ public class Main {
                          .describedAs("Yml file");
-                 /* Conctete End - Server Config */
+                 // Paper end
  
 +                // Purpur Start
 +                acceptsAll(asList("purpur", "purpur-settings"), "File for purpur settings")
diff --git a/patches/server-unmapped/0004-Timings-stuff.patch b/patches/server-unmapped/0004-Timings-stuff.patch
index 7919aa80a..5a09a99c9 100644
--- a/patches/server-unmapped/0004-Timings-stuff.patch
+++ b/patches/server-unmapped/0004-Timings-stuff.patch
@@ -5,29 +5,26 @@ Subject: [PATCH] Timings stuff
 
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 35810f42d7a0cd50a4cbe90e8d698fe57914c889..5e672a0660d0aceffcdb26d185590ca18aa4f023 100644
+index e33e889c291d37a821a4fbd40d9aac7bb079de0d..721617c62d156f0ad9f69cb0d1c2737cced1386d 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -227,10 +227,14 @@ public class TimingsExport extends Thread {
+@@ -227,9 +227,13 @@ public class TimingsExport extends Thread {
          // Information on the users Config
  
          parent.put("config", createObject(
 -            pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
--            pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
--            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Tuinity - add config to timings report
--            pair("tuinity", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)) // Tuinity - add config to timings report
-+                // Purpur start
-+                pair("server.properties", mapAsJSON(Bukkit.spigot().getServerProperties())),
-+                pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
-+                pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
-+                pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
-+                pair("tuinity", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)), // Tuinity - add config to timings report
-+                pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
-+                // Purpur end
++            // Purpur start
++            pair("server.properties", mapAsJSON(Bukkit.spigot().getServerProperties())),
+             pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
+-            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
++            pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
++            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
++            pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
++            // Purpur end
          ));
  
          new TimingsExport(listeners, parent, history).start();
-@@ -271,6 +275,19 @@ public class TimingsExport extends Thread {
+@@ -270,6 +274,19 @@ public class TimingsExport extends Thread {
          return timingsCost;
      }
  
@@ -47,7 +44,7 @@ index 35810f42d7a0cd50a4cbe90e8d698fe57914c889..5e672a0660d0aceffcdb26d185590ca1
      private static JSONObject mapAsJSON(ConfigurationSection config, String parentKey) {
  
          JSONObject object = new JSONObject();
-@@ -307,7 +324,7 @@ public class TimingsExport extends Thread {
+@@ -306,7 +323,7 @@ public class TimingsExport extends Thread {
          String response = null;
          String timingsURL = null;
          try {
diff --git a/patches/server-unmapped/0008-AFK-API.patch b/patches/server-unmapped/0008-AFK-API.patch
index ee37cbcdd..6b7c79d55 100644
--- a/patches/server-unmapped/0008-AFK-API.patch
+++ b/patches/server-unmapped/0008-AFK-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index c813077455a463dd558076d1d7474829f76b905a..b302d1f7c86a8df2ede46871397189f6f2e6b912 100644
+index 75bcfb3a2b4a104aeebb2fe3298714b2e5b569d2..0130b0329691f696107a4d1e6a01043b59077000 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -2103,8 +2103,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1913,8 +1913,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public void resetIdleTimer() {
          this.ca = SystemUtils.getMonotonicMillis();
@@ -64,10 +64,10 @@ index c813077455a463dd558076d1d7474829f76b905a..b302d1f7c86a8df2ede46871397189f6
          return this.serverStatisticManager;
      }
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index 6fc215df5ed3aa6ef0c23a57e8444602ff9309e8..a97b8d8116920237964cc3a887525f8c3804c640 100644
+index f68a252378a94c8fcab622d2d89d738aceab45a4..27c471c94312f10c4357ec87ccc96b5b2bca11f4 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
-@@ -1002,7 +1002,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -546,7 +546,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
          // CraftBukkit end
  
          if (this.everyoneSleeping && this.players.stream().noneMatch((entityplayer) -> {
@@ -76,7 +76,7 @@ index 6fc215df5ed3aa6ef0c23a57e8444602ff9309e8..a97b8d8116920237964cc3a887525f8c
          })) {
              // CraftBukkit start
              long l = this.worldData.getDayTime() + 24000L;
-@@ -1345,7 +1345,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -866,7 +866,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
              while (iterator.hasNext()) {
                  EntityPlayer entityplayer = (EntityPlayer) iterator.next();
  
@@ -86,7 +86,7 @@ index 6fc215df5ed3aa6ef0c23a57e8444602ff9309e8..a97b8d8116920237964cc3a887525f8c
                  } else if (entityplayer.isSleeping()) {
                      ++j;
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 8513795943497ca80232e7d47066a6944c2f45ec..de72ebb94052efe8c63bf28f6741a4645b3ee721 100644
+index 4001078e2a408dfd5a93c21f55a58c1fde32abbb..d228d07ee4febfdc931da5e142825f314f0a8848 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -399,6 +399,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -102,7 +102,7 @@ index 8513795943497ca80232e7d47066a6944c2f45ec..de72ebb94052efe8c63bf28f6741a464
              this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
              this.disconnect(new ChatMessage("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause
          }
-@@ -682,6 +688,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -663,6 +669,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      this.lastYaw = to.getYaw();
                      this.lastPitch = to.getPitch();
  
@@ -111,16 +111,16 @@ index 8513795943497ca80232e7d47066a6944c2f45ec..de72ebb94052efe8c63bf28f6741a464
                      // Skip the first time we do this
                      if (true) { // Spigot - don't skip any move events
                          Location oldTo = to.clone();
-@@ -1429,7 +1437,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1378,7 +1386,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
                              if (!this.player.H() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative() && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR) { // Spigot
-                                 flag1 = true; // Tuinity - diff on change, this should be moved wrongly
+                                 flag1 = true;
 -                                PlayerConnection.LOGGER.warn("{} moved wrongly!", this.player.getDisplayName().getString());
 +                                PlayerConnection.LOGGER.warn("{} moved wrongly! ({})", this.player.getDisplayName().getString(), d11); // Purpur
                              }
  
                              this.player.setLocation(d4, d5, d6, f, f1);
-@@ -1479,6 +1487,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1417,6 +1425,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
                                      this.lastYaw = to.getYaw();
                                      this.lastPitch = to.getPitch();
  
@@ -150,7 +150,7 @@ index f5e32faeb6d937cf90b1f3ea251b5cfc91f2338d..f9908fb7cc27a8947030c2100dccf1dc
      // Paper start
      public static final Predicate<Entity> affectsSpawning = (entity) -> {
 diff --git a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
-index 5bce47fa8f191bc1d33c04c9865cb0efd492a9a2..afa14eddb6a21d4747689af6d70551f10d304be7 100644
+index c39c50e53549e9cb9d3520bc7e8b7e89cfa20163..1d4021049bba4b8b23cf40d252ba2dd0b55c15ae 100644
 --- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
 +++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
 @@ -181,6 +181,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -170,10 +170,10 @@ index 5bce47fa8f191bc1d33c04c9865cb0efd492a9a2..afa14eddb6a21d4747689af6d70551f1
          super(EntityTypes.PLAYER, world);
          this.bL = ItemStack.b;
 diff --git a/src/main/java/net/minecraft/world/level/IEntityAccess.java b/src/main/java/net/minecraft/world/level/IEntityAccess.java
-index a7f2304acf8ee0a15d6eae8c42060e003be13ae7..fd56b2f15e570f266a79c25823a3b3530a693510 100644
+index 1ff9e771788a4ab52129070e355ca48df2949470..d7fc4756d14ed0360c6fb09048dc0052d1e61a1f 100644
 --- a/src/main/java/net/minecraft/world/level/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/world/level/IEntityAccess.java
-@@ -183,28 +183,18 @@ public interface IEntityAccess {
+@@ -173,28 +173,18 @@ public interface IEntityAccess {
      }
      // Paper end
  
@@ -263,10 +263,10 @@ index 361f7857e461578e90cb71e15027dadaf794cb69..2578a4677d1ee060f687be531e696b7c
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ed1bb89ae7b85bf4017315d6189d6cbf595aefe5..f3fb405c92a35796baa30cafcd96df2d8bf162e6 100644
+index cfe6898dc373fe55a08acf5c90e200061aa7d0fc..8e36d1dbde5128eea79d321496210065620acebd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2499,4 +2499,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2444,4 +2444,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return spigot;
      }
      // Spigot end
diff --git a/patches/server-unmapped/0009-Bring-back-server-name.patch b/patches/server-unmapped/0009-Bring-back-server-name.patch
index a2981838e..a9aa2c383 100644
--- a/patches/server-unmapped/0009-Bring-back-server-name.patch
+++ b/patches/server-unmapped/0009-Bring-back-server-name.patch
@@ -17,10 +17,10 @@ index 1fab9b9c7d41a0d2a551096c2c15f741a887fa2d..f33309f4c1ad92960d0634f3f5b8105c
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e0a11fe20a38e52ed008f9389ed7218825a8ee27..441a3cbe6321b289f95ea0a269d98d045d4fdffa 100644
+index 65ce132f0584abfb2d8496f1a7ea4a987a42ad94..673d9bdcd794f5fb0b74430a222ea3d2697d590b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2553,4 +2553,11 @@ public final class CraftServer implements Server {
+@@ -2555,4 +2555,11 @@ public final class CraftServer implements Server {
      }
  
      // Paper end
diff --git a/patches/server-unmapped/0010-Configurable-server-mod-name.patch b/patches/server-unmapped/0010-Configurable-server-mod-name.patch
index 9cf983bce..06378668e 100644
--- a/patches/server-unmapped/0010-Configurable-server-mod-name.patch
+++ b/patches/server-unmapped/0010-Configurable-server-mod-name.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b02affc621f1960302d8d40426e676a319b0c227..2f3d6acf497b6fa6b497a1b94ba96977ce2e6008 100644
+index 67988051844898e7ce3c60135c7bc9711be41102..7aa50a1e4ecb03a4cbe1ccf45ad7d900a8509f6f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1650,7 +1650,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1583,7 +1583,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
diff --git a/patches/server-unmapped/0011-LivingEntity-safeFallDistance.patch b/patches/server-unmapped/0011-LivingEntity-safeFallDistance.patch
index 8b82ecae4..0678acb58 100644
--- a/patches/server-unmapped/0011-LivingEntity-safeFallDistance.patch
+++ b/patches/server-unmapped/0011-LivingEntity-safeFallDistance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 2ff3297fb8c0e4f8c969ba2727eecb7fe06525c4..7d0bb706fb106709432c3fae8758d2cea1d14db8 100644
+index b7b07b652b29e6f84f87fc92add99ce68f8bbd09..b3f04847af8fc7211f5432ad851de03ebbdc1c11 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -227,6 +227,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server-unmapped/0012-Lagging-threshold.patch b/patches/server-unmapped/0012-Lagging-threshold.patch
index 0869ea358..9376c94af 100644
--- a/patches/server-unmapped/0012-Lagging-threshold.patch
+++ b/patches/server-unmapped/0012-Lagging-threshold.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2f3d6acf497b6fa6b497a1b94ba96977ce2e6008..991ac5baf3f10631edb0e60d17c714af1f406a29 100644
+index 7aa50a1e4ecb03a4cbe1ccf45ad7d900a8509f6f..c4f0bcc55546e9e01e22d5f4c328165c31e87809 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -280,6 +280,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -279,6 +279,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      public static final int TICK_TIME = 1000000000 / TPS;
      private static final int SAMPLE_INTERVAL = 20; // Paper
      public final double[] recentTps = new double[ 3 ];
@@ -16,14 +16,14 @@ index 2f3d6acf497b6fa6b497a1b94ba96977ce2e6008..991ac5baf3f10631edb0e60d17c714af
      public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
      // Spigot end
  
-@@ -1118,6 +1119,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1114,6 +1115,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                          recentTps[1] = tps5.getAverage();
                          recentTps[2] = tps15.getAverage();
                          // Paper end
 +                        lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
                          tickSection = curTime;
                      }
-                     // Tuinity - replace logic
+                     midTickChunksTasksRan = 0; // Paper
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 index 2442309843bb62e08ae13c46d335c65f7d072510..089ae62c2189fe774796ecc6caf9961d3edb5ea3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -41,10 +41,10 @@ index 2442309843bb62e08ae13c46d335c65f7d072510..089ae62c2189fe774796ecc6caf9961d
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 441a3cbe6321b289f95ea0a269d98d045d4fdffa..4fda0ebca5bb6706103c5aeedc2650d0330352b3 100644
+index 673d9bdcd794f5fb0b74430a222ea3d2697d590b..8ccfb841deb6f117726a9f7f1b326fbce62d5f02 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2559,5 +2559,10 @@ public final class CraftServer implements Server {
+@@ -2561,5 +2561,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return getProperties().serverName;
      }
diff --git a/patches/server-unmapped/0016-Player-invulnerabilities.patch b/patches/server-unmapped/0016-Player-invulnerabilities.patch
index 84f8b0429..b57c3671e 100644
--- a/patches/server-unmapped/0016-Player-invulnerabilities.patch
+++ b/patches/server-unmapped/0016-Player-invulnerabilities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index b302d1f7c86a8df2ede46871397189f6f2e6b912..79ff69f9e2dc92ffb4880cf1e059cd1d6a7bdc8a 100644
+index 0130b0329691f696107a4d1e6a01043b59077000..e06c324d38f1be72a90aa75b96d471b96123ba56 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -285,6 +285,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -17,7 +17,7 @@ index b302d1f7c86a8df2ede46871397189f6f2e6b912..79ff69f9e2dc92ffb4880cf1e059cd1d
      }
      // Paper start
      public BlockPosition getPointInFront(double inFront) {
-@@ -1129,6 +1131,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -950,6 +952,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      }
  
@@ -30,7 +30,7 @@ index b302d1f7c86a8df2ede46871397189f6f2e6b912..79ff69f9e2dc92ffb4880cf1e059cd1d
      @Override
      public boolean damageEntity(DamageSource damagesource, float f) {
          if (this.isInvulnerable(damagesource)) {
-@@ -1136,7 +1144,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -957,7 +965,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          } else {
              boolean flag = this.server.j() && this.canPvP() && "fall".equals(damagesource.translationIndex);
  
@@ -39,7 +39,7 @@ index b302d1f7c86a8df2ede46871397189f6f2e6b912..79ff69f9e2dc92ffb4880cf1e059cd1d
                  return false;
              } else {
                  if (damagesource instanceof EntityDamageSource) {
-@@ -1313,6 +1321,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1134,6 +1142,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              }
              // Paper end
  
@@ -47,7 +47,7 @@ index b302d1f7c86a8df2ede46871397189f6f2e6b912..79ff69f9e2dc92ffb4880cf1e059cd1d
              return this;
          }
      }
-@@ -2521,9 +2530,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2331,9 +2340,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isFrozen() { // Paper - protected > public
@@ -67,10 +67,10 @@ index b302d1f7c86a8df2ede46871397189f6f2e6b912..79ff69f9e2dc92ffb4880cf1e059cd1d
      public Scoreboard getScoreboard() {
          return getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index de72ebb94052efe8c63bf28f6741a4645b3ee721..d1fe1242272a422b7b528876da0d76e1aa6f3eaa 100644
+index d228d07ee4febfdc931da5e142825f314f0a8848..ab807588a4b7dc0fd8bb6f829f9d1a785490d733 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-@@ -1910,6 +1910,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1828,6 +1828,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
          // Paper start
          PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
@@ -79,10 +79,10 @@ index de72ebb94052efe8c63bf28f6741a4645b3ee721..d1fe1242272a422b7b528876da0d76e1
          this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5936075251ef3d6dda3e93866009d0e996598698..5897e4e02dad470174a31d3710520d04d4b87fb4 100644
+index 90776231b1faffb11e4394f555f336ca248e3004..6c95d8449c9931638c2550dd14eb5a08a980f327 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1015,6 +1015,8 @@ public abstract class PlayerList {
+@@ -1014,6 +1014,8 @@ public abstract class PlayerList {
          }
          // Paper end
  
@@ -108,10 +108,10 @@ index 2578a4677d1ee060f687be531e696b7c7be89e84..c441fcea9b2b5a77b801c8a69541cf42
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f3fb405c92a35796baa30cafcd96df2d8bf162e6..b7180dea1d71a68e4025388916600093dfd000c7 100644
+index 8e36d1dbde5128eea79d321496210065620acebd..45bf2b87518ba81cb4a18a59d11dba9430e63e40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2515,5 +2515,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2460,5 +2460,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetIdleTimer();
      }
diff --git a/patches/server-unmapped/0019-Alternative-Keepalive-Handling.patch b/patches/server-unmapped/0019-Alternative-Keepalive-Handling.patch
index e6342adf1..54630ced3 100644
--- a/patches/server-unmapped/0019-Alternative-Keepalive-Handling.patch
+++ b/patches/server-unmapped/0019-Alternative-Keepalive-Handling.patch
@@ -17,7 +17,7 @@ index b4c37287362907b8507d156b978ba5b9d961bb7b..9e6e6636539702507abb78515e002819
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index d1fe1242272a422b7b528876da0d76e1aa6f3eaa..8856ee8e0e7a3efda7921c0c8df9a2eb4213b1ce 100644
+index ab807588a4b7dc0fd8bb6f829f9d1a785490d733..293b2c187b813c2cf7204f12eec768fd2e92a233 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -233,6 +233,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -50,7 +50,7 @@ index d1fe1242272a422b7b528876da0d76e1aa6f3eaa..8856ee8e0e7a3efda7921c0c8df9a2eb
          if (this.isPendingPing()) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info
-@@ -3093,6 +3109,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -3011,6 +3027,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
diff --git a/patches/server-unmapped/0024-Disable-outdated-build-check.patch b/patches/server-unmapped/0024-Disable-outdated-build-check.patch
index 4fed75af6..0f6f2f074 100644
--- a/patches/server-unmapped/0024-Disable-outdated-build-check.patch
+++ b/patches/server-unmapped/0024-Disable-outdated-build-check.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable outdated build check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 424d55f51a36d9033db3dfbf2f7a86749b0e3b91..73513638dd024cb1cdd49c705921f0bcf1935968 100644
+index e34f27c6782b049d96de20e4acec1325bd97a26a..7cc2a04f921729b470be71eaddb8e79cdf605a9e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -272,7 +272,7 @@ public class Main {
+@@ -265,7 +265,7 @@ public class Main {
                      System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
                  }
  
diff --git a/patches/server-unmapped/0025-Giants-AI-settings.patch b/patches/server-unmapped/0025-Giants-AI-settings.patch
index afa44eae1..5338717b5 100644
--- a/patches/server-unmapped/0025-Giants-AI-settings.patch
+++ b/patches/server-unmapped/0025-Giants-AI-settings.patch
@@ -5,23 +5,23 @@ Subject: [PATCH] Giants AI settings
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 89852779fd9cfd19058afe40feb0cf14ca8d2896..611a2c34c80462826564705eb5a079bd6fdda4e1 100644
+index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..b260a6409aa8c3f5a0605e4b25b5525dffebe8da 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -228,7 +228,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
      public double D;
      public double E;
      public double F;
--    public float G; public final float getStepHeight() { return this.G; } // Tuinity - OBFHELPER
+-    public float G;
 +    public float G; public final float getStepHeight() { return this.G; } public void setStepHeight(float stepHeight) { this.G = stepHeight; } // Tuinity - OBFHELPER // Purpur - OBFHELPER
      public boolean noclip;
      public float I;
      protected final Random random;
 diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-index 7ba59ff9a7ed39bf69c46973a85f874c43134dc1..46e9a232ca5df81cafd4c3fc6af43b933c95d04f 100644
+index 6c024a5fdd290e5eb219e677e28718d663b72f25..5c047d7f44087adef39bcb56c121f8859748ce42 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-@@ -1021,6 +1021,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1015,6 +1015,7 @@ public abstract class EntityInsentient extends EntityLiving {
          return f;
      }
  
@@ -29,7 +29,7 @@ index 7ba59ff9a7ed39bf69c46973a85f874c43134dc1..46e9a232ca5df81cafd4c3fc6af43b93
      protected void a(DifficultyDamageScaler difficultydamagescaler) {
          if (this.random.nextFloat() < 0.15F * difficultydamagescaler.d()) {
              int i = this.random.nextInt(2);
-@@ -1128,6 +1129,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1122,6 +1123,7 @@ public abstract class EntityInsentient extends EntityLiving {
          }
      }
  
@@ -38,7 +38,7 @@ index 7ba59ff9a7ed39bf69c46973a85f874c43134dc1..46e9a232ca5df81cafd4c3fc6af43b93
          float f = difficultydamagescaler.d();
  
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 7d0bb706fb106709432c3fae8758d2cea1d14db8..032b1a519de56583990fe47a216665ce71cf93ab 100644
+index b3f04847af8fc7211f5432ad851de03ebbdc1c11..13f74514d0012a3dfb880f049e35ff8fc28cd89e 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -260,6 +260,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server-unmapped/0027-Zombie-horse-naturally-spawn.patch b/patches/server-unmapped/0027-Zombie-horse-naturally-spawn.patch
index 24f10369b..6f5cfb518 100644
--- a/patches/server-unmapped/0027-Zombie-horse-naturally-spawn.patch
+++ b/patches/server-unmapped/0027-Zombie-horse-naturally-spawn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Zombie horse naturally spawn
 
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index a97b8d8116920237964cc3a887525f8c3804c640..a0c731af6dffa30832b321f8fd86cef76ec06522 100644
+index 27c471c94312f10c4357ec87ccc96b5b2bca11f4..6200596f12f4c2b8dec67fc13e02ff95c5608ad0 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -96,6 +96,7 @@ import net.minecraft.world.entity.ai.village.poi.VillagePlace;
@@ -16,7 +16,7 @@ index a97b8d8116920237964cc3a887525f8c3804c640..a0c731af6dffa30832b321f8fd86cef7
  import net.minecraft.world.entity.animal.horse.EntityHorseSkeleton;
  import net.minecraft.world.entity.boss.EntityComplexPart;
  import net.minecraft.world.entity.boss.enderdragon.EntityEnderDragon;
-@@ -1219,12 +1220,18 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -744,12 +745,18 @@ public class WorldServer extends World implements GeneratorAccessSeed {
                  boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
  
                  if (flag1) {
diff --git a/patches/server-unmapped/0032-Dont-send-useless-entity-packets.patch b/patches/server-unmapped/0032-Dont-send-useless-entity-packets.patch
index 609fff060..3b07e683a 100644
--- a/patches/server-unmapped/0032-Dont-send-useless-entity-packets.patch
+++ b/patches/server-unmapped/0032-Dont-send-useless-entity-packets.patch
@@ -26,10 +26,10 @@ index 0eed10a6c4e0c7245f219d19ed1e2e5c94364db9..2b54a5f3347f788b751892105f888663
      protected boolean h;
      protected boolean i;
 diff --git a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
-index 67ca28463f5add7c18f7f16b918c3f36f8feeeda..53e773c14689967d5b12467bf209eefb05f7a812 100644
+index 1df8fb8cb3fcf8201e1c5fa8ca13f7a9c632c379..eaa68fb865dd23af20a05b567aad231dd8fa469c 100644
 --- a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
-@@ -200,6 +200,7 @@ public class EntityTrackerEntry {
+@@ -199,6 +199,7 @@ public class EntityTrackerEntry {
                          this.o = 0;
                          packet1 = new PacketPlayOutEntityTeleport(this.tracker);
                      }
@@ -37,7 +37,7 @@ index 67ca28463f5add7c18f7f16b918c3f36f8feeeda..53e773c14689967d5b12467bf209eefb
                  }
  
                  if ((this.e || this.tracker.impulse || this.tracker instanceof EntityLiving && ((EntityLiving) this.tracker).isGliding()) && this.tickCounter > 0) {
-@@ -286,6 +287,22 @@ public class EntityTrackerEntry {
+@@ -285,6 +286,22 @@ public class EntityTrackerEntry {
  
      }
  
diff --git a/patches/server-unmapped/0037-Cat-spawning-options.patch b/patches/server-unmapped/0037-Cat-spawning-options.patch
index 5ba975a93..f2d1f5330 100644
--- a/patches/server-unmapped/0037-Cat-spawning-options.patch
+++ b/patches/server-unmapped/0037-Cat-spawning-options.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Cat spawning options
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/village/poi/VillagePlace.java b/src/main/java/net/minecraft/world/entity/ai/village/poi/VillagePlace.java
-index 13d94ecd703b3cd0412e138532d2dd74e5bf250d..6082eed2d28f3be65daa7e7eb6f2c2a89bb28ff1 100644
+index ce165233739c7b92a76031b949f269bd0a11149c..80f73e615cb5999efd00ae75fba6d3d432395019 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/village/poi/VillagePlace.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/village/poi/VillagePlace.java
-@@ -191,6 +191,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
+@@ -59,6 +59,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
          ((VillagePlaceSection) this.e(SectionPosition.a(blockposition).s())).a(blockposition);
      }
  
@@ -83,7 +83,7 @@ index 7a495cf88d723790ee3f63645cb4792052284f32..2f54c26151c049df9d071c887dd33e48
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/IEntityAccess.java b/src/main/java/net/minecraft/world/level/IEntityAccess.java
-index fd56b2f15e570f266a79c25823a3b3530a693510..18a5d11cce748695c8f03be565d2ea37a276a981 100644
+index d7fc4756d14ed0360c6fb09048dc0052d1e61a1f..83514758bc27c0978b2ed226a98f7143ca202495 100644
 --- a/src/main/java/net/minecraft/world/level/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/world/level/IEntityAccess.java
 @@ -56,6 +56,7 @@ public interface IEntityAccess {
diff --git a/patches/server-unmapped/0039-Cows-eat-mushrooms.patch b/patches/server-unmapped/0039-Cows-eat-mushrooms.patch
index bafcfc319..4ad5afd04 100644
--- a/patches/server-unmapped/0039-Cows-eat-mushrooms.patch
+++ b/patches/server-unmapped/0039-Cows-eat-mushrooms.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Cows eat mushrooms
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 611a2c34c80462826564705eb5a079bd6fdda4e1..0f11984743ba49fc6f094c8fa6c563febf0ab7d6 100644
+index b260a6409aa8c3f5a0605e4b25b5525dffebe8da..c628c27c44884b87f188d81a92ee2eeeefe257a8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2920,6 +2920,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2673,6 +2673,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          this.invulnerable = flag;
      }
  
@@ -17,7 +17,7 @@ index 611a2c34c80462826564705eb5a079bd6fdda4e1..0f11984743ba49fc6f094c8fa6c563fe
          this.setPositionRotation(entity.locX(), entity.locY(), entity.locZ(), entity.yaw, entity.pitch);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 032b1a519de56583990fe47a216665ce71cf93ab..9d950f5d5d6b9d686bd3bbaa12a8d933fd1e2ec2 100644
+index 13f74514d0012a3dfb880f049e35ff8fc28cd89e..0a948395a3ef9d472925175b36a6b66082002909 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -175,7 +175,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server-unmapped/0043-Ender-dragon-always-drop-full-exp.patch b/patches/server-unmapped/0043-Ender-dragon-always-drop-full-exp.patch
index 9dd6fd48b..298abe952 100644
--- a/patches/server-unmapped/0043-Ender-dragon-always-drop-full-exp.patch
+++ b/patches/server-unmapped/0043-Ender-dragon-always-drop-full-exp.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ender dragon always drop full exp
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
-index 07160de8725787551df327c0790b2d6e0876524f..3fff101637708a1a12f9a457bd3512ae94a8f884 100644
+index c296fcf80c2f3f210fa020416973ec8d5db541ba..58b9ace88793d1f661b16db1b43433484a697936 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
 @@ -613,7 +613,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
diff --git a/patches/server-unmapped/0045-Signs-allow-color-codes.patch b/patches/server-unmapped/0045-Signs-allow-color-codes.patch
index 21db1113e..fc8d0c03d 100644
--- a/patches/server-unmapped/0045-Signs-allow-color-codes.patch
+++ b/patches/server-unmapped/0045-Signs-allow-color-codes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 79ff69f9e2dc92ffb4880cf1e059cd1d6a7bdc8a..1ce550ecae370e9e5247d653b259436592b072ab 100644
+index e06c324d38f1be72a90aa75b96d471b96123ba56..615d4d43b8112a7b101792aebf952b0361be70d5 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -1604,6 +1604,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1425,6 +1425,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public void openSign(TileEntitySign tileentitysign) {
@@ -17,10 +17,10 @@ index 79ff69f9e2dc92ffb4880cf1e059cd1d6a7bdc8a..1ce550ecae370e9e5247d653b2594365
          this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
      }
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 8856ee8e0e7a3efda7921c0c8df9a2eb4213b1ce..e8a9c8a7fc4089e48e09afc1638cf1ccde7b0fab 100644
+index 293b2c187b813c2cf7204f12eec768fd2e92a233..0bfd2c062afcfc73ff21c69a30f63529502817f7 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-@@ -3087,6 +3087,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -3005,6 +3005,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
                  }
                  // Paper end
diff --git a/patches/server-unmapped/0046-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server-unmapped/0046-Allow-soil-to-moisten-from-water-directly-under-it.patch
index 73f445319..4363243bc 100644
--- a/patches/server-unmapped/0046-Allow-soil-to-moisten-from-water-directly-under-it.patch
+++ b/patches/server-unmapped/0046-Allow-soil-to-moisten-from-water-directly-under-it.patch
@@ -5,18 +5,36 @@ Subject: [PATCH] Allow soil to moisten from water directly under it
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BlockSoil.java b/src/main/java/net/minecraft/world/level/block/BlockSoil.java
-index ac830ea21e639652908fe82a253853b26b412e4d..50cf0f3a67a32fe221afaee095189de87135f355 100644
+index 3bedb1c6a0f221c7b40ee0a50f676e8b05bd37a7..2bbaa2fb426869223a9b2f07406496c1b0daff3f 100644
 --- a/src/main/java/net/minecraft/world/level/block/BlockSoil.java
 +++ b/src/main/java/net/minecraft/world/level/block/BlockSoil.java
-@@ -159,7 +159,7 @@ public class BlockSoil extends Block {
-             }
-         }
- 
--        return false;
-+        return ((WorldServer) iworldreader).purpurConfig.farmlandGetsMoistFromBelow && iworldreader.getFluid(blockposition.shift(EnumDirection.DOWN)).isTagged(TagsFluid.WATER); // Purpur
-         // Tuinity end - remove abstract block iteration
+@@ -139,19 +139,14 @@ public class BlockSoil extends Block {
      }
  
+     private static boolean a(IWorldReader iworldreader, BlockPosition blockposition) {
+-        Iterator iterator = BlockPosition.a(blockposition.b(-4, 0, -4), blockposition.b(4, 1, 4)).iterator();
+-
+-        BlockPosition blockposition1;
+-
+-        do {
+-            if (!iterator.hasNext()) {
+-                return false;
++        // Purpur start
++        for (BlockPosition position : BlockPosition.a(blockposition.b(-4, 0, -4), blockposition.b(4, 1, 4))) {
++            if (iworldreader.getFluid(position).a(TagsFluid.WATER)) {
++                return true;
+             }
+-
+-            blockposition1 = (BlockPosition) iterator.next();
+-        } while (!iworldreader.getFluid(blockposition1).a((Tag) TagsFluid.WATER));
+-
+-        return true;
++        }
++        return ((WorldServer) iworldreader).purpurConfig.farmlandGetsMoistFromBelow && iworldreader.getFluid(blockposition.shift(EnumDirection.DOWN)).a(TagsFluid.WATER);
++        // Purpur end
+     }
+ 
+     @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 index b67f87f38d0ff99ff62d2103ecc737317a435102..2e4a928a3e88fb3d961d9530695cd7154321c79b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
diff --git a/patches/server-unmapped/0047-Minecart-settings-and-WASD-controls.patch b/patches/server-unmapped/0047-Minecart-settings-and-WASD-controls.patch
index 1d04085b1..66bfc1ec8 100644
--- a/patches/server-unmapped/0047-Minecart-settings-and-WASD-controls.patch
+++ b/patches/server-unmapped/0047-Minecart-settings-and-WASD-controls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Minecart settings and WASD controls
 
 
 diff --git a/src/main/java/net/minecraft/core/BlockPosition.java b/src/main/java/net/minecraft/core/BlockPosition.java
-index 6a6381e85fef2ae2b9b5e6dff0b7917b92fa01e5..17d63cd4ca152adc66ffe9ffd3227a0770738a29 100644
+index 4abc87b7e737bc652e84f76a508ab85501d1556f..85b3515feb67a1232d65c0421bb8a08a25090e07 100644
 --- a/src/main/java/net/minecraft/core/BlockPosition.java
 +++ b/src/main/java/net/minecraft/core/BlockPosition.java
 @@ -42,6 +42,12 @@ public class BlockPosition extends BaseBlockPosition {
@@ -22,10 +22,10 @@ index 6a6381e85fef2ae2b9b5e6dff0b7917b92fa01e5..17d63cd4ca152adc66ffe9ffd3227a07
          super(i, j, k);
      }
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 1ce550ecae370e9e5247d653b259436592b072ab..9746ade740ab36e68f24e0ee09d24e23f9e6a68f 100644
+index 615d4d43b8112a7b101792aebf952b0361be70d5..e209133b8ae35324c51ed7c8b2703bc1adfd5bf8 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -1142,6 +1142,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -963,6 +963,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          if (this.isInvulnerable(damagesource)) {
              return false;
          } else {
@@ -34,7 +34,7 @@ index 1ce550ecae370e9e5247d653b259436592b072ab..9746ade740ab36e68f24e0ee09d24e23
  
              if (!flag && isSpawnInvulnerable() && damagesource != DamageSource.OUT_OF_WORLD) { // Purpur
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 9d950f5d5d6b9d686bd3bbaa12a8d933fd1e2ec2..f940a5460fe443bb97f23f29cff12827adb2eca4 100644
+index 0a948395a3ef9d472925175b36a6b66082002909..14be521b1019b58508268c21cb1d3cc806e75d17 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -193,9 +193,9 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server-unmapped/0048-Disable-loot-drops-on-death-by-cramming.patch b/patches/server-unmapped/0048-Disable-loot-drops-on-death-by-cramming.patch
index 0645ab306..19e37dcb1 100644
--- a/patches/server-unmapped/0048-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/server-unmapped/0048-Disable-loot-drops-on-death-by-cramming.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index f940a5460fe443bb97f23f29cff12827adb2eca4..871286b2f26f49aa49611503053cb6b1f0a064dc 100644
+index 14be521b1019b58508268c21cb1d3cc806e75d17..a108c2fa6c4146eba0784f912c3cfa498b86a1e7 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -1595,8 +1595,10 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server-unmapped/0049-Players-should-not-cram-to-death.patch b/patches/server-unmapped/0049-Players-should-not-cram-to-death.patch
index 70350e735..6a8fef1a0 100644
--- a/patches/server-unmapped/0049-Players-should-not-cram-to-death.patch
+++ b/patches/server-unmapped/0049-Players-should-not-cram-to-death.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Players should not cram to death
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 9746ade740ab36e68f24e0ee09d24e23f9e6a68f..4ce97052092c4b5f0fa59de7442654f7025febb6 100644
+index e209133b8ae35324c51ed7c8b2703bc1adfd5bf8..d33b8366617cddde687cadb18ed523f47c8608a8 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -1581,7 +1581,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1402,7 +1402,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isInvulnerable(DamageSource damagesource) {
diff --git a/patches/server-unmapped/0052-Fix-the-dead-lagging-the-server.patch b/patches/server-unmapped/0052-Fix-the-dead-lagging-the-server.patch
index a5ef06001..85af0144e 100644
--- a/patches/server-unmapped/0052-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server-unmapped/0052-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 0f11984743ba49fc6f094c8fa6c563febf0ab7d6..e458be6377595efed8dfb6527ab0b7a0f0f87d84 100644
+index c628c27c44884b87f188d81a92ee2eeeefe257a8..5a235642c702e6a0c1971d060b5e5a41ad277b65 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1659,6 +1659,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -1415,6 +1415,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          this.pitch = MathHelper.a(f1, -90.0F, 90.0F) % 360.0F;
          this.lastYaw = this.yaw;
          this.lastPitch = this.pitch;
@@ -17,7 +17,7 @@ index 0f11984743ba49fc6f094c8fa6c563febf0ab7d6..e458be6377595efed8dfb6527ab0b7a0
  
      public void f(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 871286b2f26f49aa49611503053cb6b1f0a064dc..efca085c5db03242b471db811c44224ca49eb305 100644
+index a108c2fa6c4146eba0784f912c3cfa498b86a1e7..928ba00369d9f863e9de3294844faae282804df3 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -2594,7 +2594,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server-unmapped/0054-Add-permission-for-F3-N-debug.patch b/patches/server-unmapped/0054-Add-permission-for-F3-N-debug.patch
index f46521976..350ba01d1 100644
--- a/patches/server-unmapped/0054-Add-permission-for-F3-N-debug.patch
+++ b/patches/server-unmapped/0054-Add-permission-for-F3-N-debug.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for F3+N debug
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5897e4e02dad470174a31d3710520d04d4b87fb4..80f6a4e7204bceca3f312fe5c8d572f971a7fa4b 100644
+index 6c95d8449c9931638c2550dd14eb5a08a980f327..1d7685f5373249a6cc950ebd8a75cda53e5680d6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1174,6 +1174,7 @@ public abstract class PlayerList {
+@@ -1173,6 +1173,7 @@ public abstract class PlayerList {
              } else {
                  b0 = (byte) (24 + i);
              }
diff --git a/patches/server-unmapped/0056-Configurable-TPS-Catchup.patch b/patches/server-unmapped/0056-Configurable-TPS-Catchup.patch
index 13e6a643d..484c73281 100644
--- a/patches/server-unmapped/0056-Configurable-TPS-Catchup.patch
+++ b/patches/server-unmapped/0056-Configurable-TPS-Catchup.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable TPS Catchup
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 991ac5baf3f10631edb0e60d17c714af1f406a29..d93ecf4b3451b1c3c309aadfe2ec287a68df0713 100644
+index c4f0bcc55546e9e01e22d5f4c328165c31e87809..41de6d447226d9a26a49fd0303344adaf7465064 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1136,7 +1136,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1132,7 +1132,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                      this.a(this::canSleepForTick);
                      this.methodProfiler.exitEnter("nextTickWait");
                      this.X = true;
diff --git a/patches/server-unmapped/0059-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch b/patches/server-unmapped/0059-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
index 977898281..1cca3c660 100644
--- a/patches/server-unmapped/0059-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
+++ b/patches/server-unmapped/0059-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entities pick up loot bypass mob-griefing gamerule
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-index 46e9a232ca5df81cafd4c3fc6af43b933c95d04f..efd8126844d5b5cd93ef465744c8d512924c8885 100644
+index 5c047d7f44087adef39bcb56c121f8859748ce42..d2841e1528804841532bbfa885a2689669ad5429 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 @@ -614,7 +614,7 @@ public abstract class EntityInsentient extends EntityLiving {
diff --git a/patches/server-unmapped/0062-Allow-leashing-villagers.patch b/patches/server-unmapped/0062-Allow-leashing-villagers.patch
index c9c1fddb2..9a95a2044 100644
--- a/patches/server-unmapped/0062-Allow-leashing-villagers.patch
+++ b/patches/server-unmapped/0062-Allow-leashing-villagers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow leashing villagers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-index efd8126844d5b5cd93ef465744c8d512924c8885..864b9bf8f41476e876fd386cdbfb007898584ad6 100644
+index d2841e1528804841532bbfa885a2689669ad5429..f6e868a5cd62e0d997a2538c6b2bead0e3d88178 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 @@ -49,6 +49,7 @@ import net.minecraft.world.entity.item.EntityItem;
@@ -16,7 +16,7 @@ index efd8126844d5b5cd93ef465744c8d512924c8885..864b9bf8f41476e876fd386cdbfb0078
  import net.minecraft.world.entity.player.EntityHuman;
  import net.minecraft.world.entity.vehicle.EntityBoat;
  import net.minecraft.world.item.Item;
-@@ -1218,6 +1219,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1212,6 +1213,7 @@ public abstract class EntityInsentient extends EntityLiving {
          if (!this.isAlive()) {
              return EnumInteractionResult.PASS;
          } else if (this.getLeashHolder() == entityhuman) {
diff --git a/patches/server-unmapped/0066-Add-player-death-exp-control-options.patch b/patches/server-unmapped/0066-Add-player-death-exp-control-options.patch
index 88084b0bf..7b2eee949 100644
--- a/patches/server-unmapped/0066-Add-player-death-exp-control-options.patch
+++ b/patches/server-unmapped/0066-Add-player-death-exp-control-options.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add player death exp control options
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
-index afa14eddb6a21d4747689af6d70551f10d304be7..f9ce15aa4a2b1ee07f9c31b793410a4ff27ec829 100644
+index 1d4021049bba4b8b23cf40d252ba2dd0b55c15ae..98a27249164be967512e7e745c20e80c80d3c5c8 100644
 --- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
 +++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
 @@ -182,6 +182,8 @@ public abstract class EntityHuman extends EntityLiving {
@@ -17,7 +17,7 @@ index afa14eddb6a21d4747689af6d70551f10d304be7..f9ce15aa4a2b1ee07f9c31b793410a4f
      public void setAfk(boolean setAfk){
      }
  
-@@ -1825,9 +1827,18 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1819,9 +1821,18 @@ public abstract class EntityHuman extends EntityLiving {
      @Override
      protected int getExpValue(EntityHuman entityhuman) {
          if (!this.world.getGameRules().getBoolean(GameRules.KEEP_INVENTORY) && !this.isSpectator()) {
diff --git a/patches/server-unmapped/0067-Add-canSaveToDisk-to-Entity.patch b/patches/server-unmapped/0067-Add-canSaveToDisk-to-Entity.patch
index 83c0fc8f9..23c6ba5ae 100644
--- a/patches/server-unmapped/0067-Add-canSaveToDisk-to-Entity.patch
+++ b/patches/server-unmapped/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 e458be6377595efed8dfb6527ab0b7a0f0f87d84..cfe6a52fa45c8dfcb2136978456b6abf7a32258c 100644
+index 5a235642c702e6a0c1971d060b5e5a41ad277b65..0bb2b362f257801d3ec8d232f2970d88b32f2748 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -444,6 +444,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -388,6 +388,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          this.headHeight = this.getHeadHeight(EntityPose.STANDING, this.size);
      }
  
@@ -22,10 +22,10 @@ index e458be6377595efed8dfb6527ab0b7a0f0f87d84..cfe6a52fa45c8dfcb2136978456b6abf
          return false;
      }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.java
-index ec2b238480413ba9c123d9ddeaa787d9520e1b74..3fbeb01275a48b4173f98ae0c7f09e4c0e6445e7 100644
+index 4eaf497d048324a85ce49fc1c6e9559991c20df7..4eb89daf27621a212d12d410aa819e2453708922 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.java
-@@ -580,6 +580,7 @@ public class ChunkRegionLoader {
+@@ -546,6 +546,7 @@ public class ChunkRegionLoader {
  
                  while (iterator1.hasNext()) {
                      Entity entity = (Entity) iterator1.next();
diff --git a/patches/server-unmapped/0068-Configurable-void-damage-height-and-damage.patch b/patches/server-unmapped/0068-Configurable-void-damage-height-and-damage.patch
index ff2178259..967964120 100644
--- a/patches/server-unmapped/0068-Configurable-void-damage-height-and-damage.patch
+++ b/patches/server-unmapped/0068-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 cfe6a52fa45c8dfcb2136978456b6abf7a32258c..b3618e2100404d1b13d2930d463b8e283ea62f64 100644
+index 0bb2b362f257801d3ec8d232f2970d88b32f2748..9b739a7ed9761c045ba23b065bd8548ef0b81130 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -747,7 +747,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -691,7 +691,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
  
      // Paper start
      protected void performVoidDamage() {
@@ -18,7 +18,7 @@ index cfe6a52fa45c8dfcb2136978456b6abf7a32258c..b3618e2100404d1b13d2930d463b8e28
              && this.locY() >= world.paperConfig.netherVoidTopDamageHeight)) {
              this.doVoidDamage();
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index efca085c5db03242b471db811c44224ca49eb305..e0b42e8db2e48f7327abfbb643ce4f14cc13a7af 100644
+index 928ba00369d9f863e9de3294844faae282804df3..2b8e1843ed01542f9fc0ce400b772d44eed305fc 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -2113,7 +2113,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server-unmapped/0069-Dispenser-curse-of-binding-protection.patch b/patches/server-unmapped/0069-Dispenser-curse-of-binding-protection.patch
index 64be7324e..9026596ac 100644
--- a/patches/server-unmapped/0069-Dispenser-curse-of-binding-protection.patch
+++ b/patches/server-unmapped/0069-Dispenser-curse-of-binding-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dispenser curse of binding protection
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-index 864b9bf8f41476e876fd386cdbfb007898584ad6..b70120c32027a456037daac363d420d2edd4bdfe 100644
+index f6e868a5cd62e0d997a2538c6b2bead0e3d88178..5a9a658c56f1d39bcbcabc0415c1c3f7d96cfab7 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 @@ -65,6 +65,7 @@ import net.minecraft.world.item.ItemSword;
@@ -16,7 +16,7 @@ index 864b9bf8f41476e876fd386cdbfb007898584ad6..b70120c32027a456037daac363d420d2
  import net.minecraft.world.level.GameRules;
  import net.minecraft.world.level.GeneratorAccess;
  import net.minecraft.world.level.IBlockAccess;
-@@ -1068,6 +1069,13 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1062,6 +1063,13 @@ public abstract class EntityInsentient extends EntityLiving {
  
      }
  
diff --git a/patches/server-unmapped/0073-Add-5-second-tps-average-in-tps.patch b/patches/server-unmapped/0073-Add-5-second-tps-average-in-tps.patch
index 5cd4dd5f3..462097f1d 100644
--- a/patches/server-unmapped/0073-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server-unmapped/0073-Add-5-second-tps-average-in-tps.patch
@@ -27,10 +27,10 @@ index dc6bc1910ad0f9b27144d5750078c3ca607d03d3..e8be35f836ede2630d44902e99a21489
          setListData(vector);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d93ecf4b3451b1c3c309aadfe2ec287a68df0713..afe3c53252354760b22901f7f109fd5d265928e0 100644
+index 41de6d447226d9a26a49fd0303344adaf7465064..6afff6ba0c59e3285c99fddf3de738d95153ed24 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -279,7 +279,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -278,7 +278,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      public static final int TPS = 20;
      public static final int TICK_TIME = 1000000000 / TPS;
      private static final int SAMPLE_INTERVAL = 20; // Paper
@@ -39,7 +39,7 @@ index d93ecf4b3451b1c3c309aadfe2ec287a68df0713..afe3c53252354760b22901f7f109fd5d
      public boolean lagging = false; // Purpur
      public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
      // Spigot end
-@@ -1019,6 +1019,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1017,6 +1017,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
      private long lastTick = 0;
      private long catchupTime = 0;
@@ -47,7 +47,7 @@ index d93ecf4b3451b1c3c309aadfe2ec287a68df0713..afe3c53252354760b22901f7f109fd5d
      public final RollingAverage tps1 = new RollingAverage(60);
      public final RollingAverage tps5 = new RollingAverage(60 * 5);
      public final RollingAverage tps15 = new RollingAverage(60 * 15);
-@@ -1111,13 +1112,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1107,13 +1108,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                      {
                          final long diff = curTime - tickSection;
                          java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
@@ -69,10 +69,10 @@ index d93ecf4b3451b1c3c309aadfe2ec287a68df0713..afe3c53252354760b22901f7f109fd5d
                          lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
                          tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4fda0ebca5bb6706103c5aeedc2650d0330352b3..e9d6c38a042195dae44109706cf5710e7ac3d316 100644
+index 8ccfb841deb6f117726a9f7f1b326fbce62d5f02..7d12462a1fe0646528e79905e9aedba8dc855406 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2333,6 +2333,7 @@ public final class CraftServer implements Server {
+@@ -2332,6 +2332,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {
diff --git a/patches/server-unmapped/0074-Implement-elytra-settings.patch b/patches/server-unmapped/0074-Implement-elytra-settings.patch
index b70b2a87d..4790b878f 100644
--- a/patches/server-unmapped/0074-Implement-elytra-settings.patch
+++ b/patches/server-unmapped/0074-Implement-elytra-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement elytra settings
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index e0b42e8db2e48f7327abfbb643ce4f14cc13a7af..4bac98718f67699433fdd89307c20438f3ee6425 100644
+index 2b8e1843ed01542f9fc0ce400b772d44eed305fc..dc946534a9f218a2f2a7838cbc64bf9dc3b96375 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -2952,7 +2952,16 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server-unmapped/0075-Item-entity-immunities.patch b/patches/server-unmapped/0075-Item-entity-immunities.patch
index 7296829ac..7239363cd 100644
--- a/patches/server-unmapped/0075-Item-entity-immunities.patch
+++ b/patches/server-unmapped/0075-Item-entity-immunities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
-index 53e773c14689967d5b12467bf209eefb05f7a812..b8f9238c598a55ba796951cb775cd35f3a401fa8 100644
+index eaa68fb865dd23af20a05b567aad231dd8fa469c..7d76cb3951fe4ce68292a120c36af4a5fd63f4a8 100644
 --- a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
 @@ -67,7 +67,7 @@ public class EntityTrackerEntry {
@@ -18,10 +18,10 @@ index 53e773c14689967d5b12467bf209eefb05f7a812..b8f9238c598a55ba796951cb775cd35f
      private java.util.Map<EntityPlayer, Boolean> trackedPlayerMap = null;
  
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index d827e18d8c3b9b5869dbb1e233f415ba0efb7c1b..d876c5037b4704a174606629c80ba1142c77a50c 100644
+index 6835401bd7863bbd655502547a9fd4ae0f298da1..1f4ef4f556ce31581819ca82ec81691025d0f7a5 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-@@ -2431,7 +2431,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
+@@ -2357,7 +2357,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
  
      public class EntityTracker {
  
@@ -31,10 +31,10 @@ index d827e18d8c3b9b5869dbb1e233f415ba0efb7c1b..d876c5037b4704a174606629c80ba114
          private final int trackingDistance;
          private SectionPosition e;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b3618e2100404d1b13d2930d463b8e283ea62f64..d5882cac0dd43cea6e7184487e6d25fa34ebafc2 100644
+index 9b739a7ed9761c045ba23b065bd8548ef0b81130..e433ca9305ced694a3dbb9fc8a1c5eddb7e6b431 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1608,6 +1608,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -1364,6 +1364,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
  
      }
  
@@ -43,7 +43,7 @@ index b3618e2100404d1b13d2930d463b8e283ea62f64..d5882cac0dd43cea6e7184487e6d25fa
          return this.O == tag;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/item/EntityItem.java b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
-index 077990f1d95ded2c8b89c38978ec25a56df3a984..be46b8fcbfed932ba96a34c94eee0b237c783bd4 100644
+index 8b79220c27292f9b92d9884bbbe4b16d7762343c..cd711fa6f4d8e98fbfa9e3956d9fb1d36e6bb2d9 100644
 --- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java
 +++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
 @@ -50,6 +50,12 @@ public class EntityItem extends Entity {
diff --git a/patches/server-unmapped/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server-unmapped/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index 7936c330f..57dc322d0 100644
--- a/patches/server-unmapped/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/server-unmapped/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d5882cac0dd43cea6e7184487e6d25fa34ebafc2..6dc051e0da0a97bcd9e4cba94c2cabc411ebb86f 100644
+index e433ca9305ced694a3dbb9fc8a1c5eddb7e6b431..ff07ab36b0e4565ddcaf672e503c2a5740670c2a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2279,8 +2279,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2034,8 +2034,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return this.a(new ItemStack(imaterial), (float) i);
      }
  
diff --git a/patches/server-unmapped/0079-Add-phantom-spawning-options.patch b/patches/server-unmapped/0079-Add-phantom-spawning-options.patch
index ae1424d47..4fc514b1d 100644
--- a/patches/server-unmapped/0079-Add-phantom-spawning-options.patch
+++ b/patches/server-unmapped/0079-Add-phantom-spawning-options.patch
@@ -49,10 +49,10 @@ index 8b2e57c833c03940f2e0727e00decce59f263269..642bf019d32a2fdc18718337ecfe45d2
          return this.getBrightness(EnumSkyBlock.SKY, blockposition) >= this.K();
      }
 diff --git a/src/main/java/net/minecraft/world/level/SpawnerCreature.java b/src/main/java/net/minecraft/world/level/SpawnerCreature.java
-index 9b55da1f4d40ae36b2d2b8e7b3b18989dc4f6006..050651462390f0896f0629408d0f7d29d35bdb7f 100644
+index 24771c3522ea74ac12058591137eafc21adf3762..943de7e98bcd3b9418c1bdc5fd277059cb1206d8 100644
 --- a/src/main/java/net/minecraft/world/level/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/world/level/SpawnerCreature.java
-@@ -428,6 +428,7 @@ public final class SpawnerCreature {
+@@ -419,6 +419,7 @@ public final class SpawnerCreature {
          return new BlockPosition(i, l, j);
      }
  
@@ -61,10 +61,10 @@ index 9b55da1f4d40ae36b2d2b8e7b3b18989dc4f6006..050651462390f0896f0629408d0f7d29
          return iblockdata.r(iblockaccess, blockposition) ? false : (iblockdata.isPowerSource() ? false : (!fluid.isEmpty() ? false : (iblockdata.a((Tag) TagsBlock.PREVENT_MOB_SPAWNING_INSIDE) ? false : !entitytypes.a(iblockdata))));
      }
 diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
-index 22d91a970c7376aa6349bb6cd9cb174e89bc8a09..7133b814b414a8aae2f056b9205cf58ca68ab887 100644
+index bb01bbee04caafbe41435835e79bc699c3d96d46..be4c1786d46046dd7ce583cad8207db57a558947 100644
 --- a/src/main/java/net/minecraft/world/level/World.java
 +++ b/src/main/java/net/minecraft/world/level/World.java
-@@ -1664,6 +1664,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1463,6 +1463,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          return new DifficultyDamageScaler(this.getDifficulty(), this.getDayTime(), i, f);
      }
  
diff --git a/patches/server-unmapped/0082-Add-allow-water-in-end-world-option.patch b/patches/server-unmapped/0082-Add-allow-water-in-end-world-option.patch
index ed10bb73f..4c5b7f4be 100644
--- a/patches/server-unmapped/0082-Add-allow-water-in-end-world-option.patch
+++ b/patches/server-unmapped/0082-Add-allow-water-in-end-world-option.patch
@@ -27,10 +27,10 @@ index f97447d77890cd65b5613899c389483bcf82be01..7eb3238b5820bb13f25d78d780872265
  
                  return true;
 diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
-index 7133b814b414a8aae2f056b9205cf58ca68ab887..137583da4926ce85d258fce98c919618d02a5f77 100644
+index be4c1786d46046dd7ce583cad8207db57a558947..2c4bfc663c31e72706eedd4db4533db5a50456db 100644
 --- a/src/main/java/net/minecraft/world/level/World.java
 +++ b/src/main/java/net/minecraft/world/level/World.java
-@@ -1739,4 +1739,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1538,4 +1538,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      public final boolean isDebugWorld() {
          return this.debugWorld;
      }
diff --git a/patches/server-unmapped/0083-Allow-color-codes-in-books.patch b/patches/server-unmapped/0083-Allow-color-codes-in-books.patch
index 3f2ff2a67..17fdd89d3 100644
--- a/patches/server-unmapped/0083-Allow-color-codes-in-books.patch
+++ b/patches/server-unmapped/0083-Allow-color-codes-in-books.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow color codes in books
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index e8a9c8a7fc4089e48e09afc1638cf1ccde7b0fab..d16149731efbaa9ad19083d5654f4e1e14ef3b76 100644
+index 0bfd2c062afcfc73ff21c69a30f63529502817f7..611989cd519a5c695d1369b0e74159925c55b726 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-@@ -1224,7 +1224,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1180,7 +1180,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
          if (itemstack.getItem() == Items.WRITABLE_BOOK) {
              NBTTagList nbttaglist = new NBTTagList();
  
@@ -18,7 +18,7 @@ index e8a9c8a7fc4089e48e09afc1638cf1ccde7b0fab..d16149731efbaa9ad19083d5654f4e1e
              ItemStack old = itemstack.cloneItemStack(); // CraftBukkit
              itemstack.a("pages", (NBTBase) nbttaglist);
              this.player.inventory.setItem(i, CraftEventFactory.handleEditBookEvent(player, i, old, itemstack)); // CraftBukkit // Paper - Don't ignore result (see other callsite for handleEditBookEvent)
-@@ -1242,13 +1243,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1198,13 +1199,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  itemstack1.setTag(nbttagcompound.clone());
              }
  
@@ -35,7 +35,7 @@ index e8a9c8a7fc4089e48e09afc1638cf1ccde7b0fab..d16149731efbaa9ad19083d5654f4e1e
                  ChatComponentText chatcomponenttext = new ChatComponentText(s1);
                  String s2 = IChatBaseComponent.ChatSerializer.a((IChatBaseComponent) chatcomponenttext);
  
-@@ -1260,6 +1262,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1216,6 +1218,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
          }
      }
  
diff --git a/patches/server-unmapped/0084-Entity-lifespan.patch b/patches/server-unmapped/0084-Entity-lifespan.patch
index d93e63bc7..776067672 100644
--- a/patches/server-unmapped/0084-Entity-lifespan.patch
+++ b/patches/server-unmapped/0084-Entity-lifespan.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity lifespan
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index d16149731efbaa9ad19083d5654f4e1e14ef3b76..10c5af3949af4a3bee4999753e7545f0ac745e63 100644
+index 611989cd519a5c695d1369b0e74159925c55b726..f92e412d7f49c620699274ecf9ed085c5af53ab8 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-@@ -2472,6 +2472,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2390,6 +2390,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      boolean triggerLeashUpdate = itemInHand != null && itemInHand.getItem() == Items.LEAD && entity instanceof EntityInsentient;
                      Item origItem = this.player.inventory.getItemInHand() == null ? null : this.player.inventory.getItemInHand().getItem();
                      PlayerInteractEntityEvent event;
@@ -17,7 +17,7 @@ index d16149731efbaa9ad19083d5654f4e1e14ef3b76..10c5af3949af4a3bee4999753e7545f0
                          event = new PlayerInteractEntityEvent((Player) this.getPlayer(), entity.getBukkitEntity(), (packetplayinuseentity.c() == EnumHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND);
                      } else {
 diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-index b70120c32027a456037daac363d420d2edd4bdfe..fdc1b99f0a032a76a02ee88b28d62e049a2fc54c 100644
+index 5a9a658c56f1d39bcbcabc0415c1c3f7d96cfab7..6ea0fc81efe976c2b33cc12de175b357323b9cfd 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 @@ -124,7 +124,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -94,7 +94,7 @@ index b70120c32027a456037daac363d420d2edd4bdfe..fdc1b99f0a032a76a02ee88b28d62e04
      }
  
      @Override
-@@ -1626,7 +1658,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1620,7 +1652,7 @@ public abstract class EntityInsentient extends EntityLiving {
              this.a((EntityLiving) this, entity);
              this.z(entity);
          }
diff --git a/patches/server-unmapped/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server-unmapped/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
index a8fef9ceb..42d20cae1 100644
--- a/patches/server-unmapped/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/server-unmapped/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 4ce97052092c4b5f0fa59de7442654f7025febb6..38d63449b4ec833ec53de5fe6deebbb3f744492e 100644
+index d33b8366617cddde687cadb18ed523f47c8608a8..996ff0b36379f18af7c68b4c50ea291fe8091970 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -2588,4 +2588,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2398,4 +2398,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          return (CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end
@@ -36,7 +36,7 @@ index 4ce97052092c4b5f0fa59de7442654f7025febb6..38d63449b4ec833ec53de5fe6deebbb3
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 4bac98718f67699433fdd89307c20438f3ee6425..087b18b1fbf9d5e64ddf7f303aaad58bb9e1c3f5 100644
+index dc946534a9f218a2f2a7838cbc64bf9dc3b96375..068052f2df6baca9169b1b5bc9c990798649be8f 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -45,6 +45,7 @@ import net.minecraft.network.syncher.DataWatcher;
diff --git a/patches/server-unmapped/0092-Totems-work-in-inventory.patch b/patches/server-unmapped/0092-Totems-work-in-inventory.patch
index e77937ef5..f16686cc0 100644
--- a/patches/server-unmapped/0092-Totems-work-in-inventory.patch
+++ b/patches/server-unmapped/0092-Totems-work-in-inventory.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 087b18b1fbf9d5e64ddf7f303aaad58bb9e1c3f5..1140fc3cade24320bbc3e09a8664ded27df604fe 100644
+index 068052f2df6baca9169b1b5bc9c990798649be8f..50b64ab1cbc1940d2f8b5d938e41f5a31830da5b 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -1423,6 +1423,19 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server-unmapped/0094-Add-vindicator-johnny-spawn-chance.patch b/patches/server-unmapped/0093-Add-vindicator-johnny-spawn-chance.patch
similarity index 100%
rename from patches/server-unmapped/0094-Add-vindicator-johnny-spawn-chance.patch
rename to patches/server-unmapped/0093-Add-vindicator-johnny-spawn-chance.patch
diff --git a/patches/server-unmapped/0095-Add-option-to-disable-certain-block-updates.patch b/patches/server-unmapped/0094-Add-option-to-disable-certain-block-updates.patch
similarity index 100%
rename from patches/server-unmapped/0095-Add-option-to-disable-certain-block-updates.patch
rename to patches/server-unmapped/0094-Add-option-to-disable-certain-block-updates.patch
diff --git a/patches/server-unmapped/0096-Dispensers-place-anvils-option.patch b/patches/server-unmapped/0095-Dispensers-place-anvils-option.patch
similarity index 97%
rename from patches/server-unmapped/0096-Dispensers-place-anvils-option.patch
rename to patches/server-unmapped/0095-Dispensers-place-anvils-option.patch
index 68248f4ef..96cf384e2 100644
--- a/patches/server-unmapped/0096-Dispensers-place-anvils-option.patch
+++ b/patches/server-unmapped/0095-Dispensers-place-anvils-option.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dispensers place anvils option
 
 
 diff --git a/src/main/java/net/minecraft/core/EnumDirection.java b/src/main/java/net/minecraft/core/EnumDirection.java
-index 7918d830a4aef09c9f517284e83a9376299116ad..29d747f7fc5824a222755ebf96dfe053896d43d0 100644
+index 703bdefeb615ef8d15b428a893b5e4939d726f13..1a765ece1ad6d691c509a018469aa9ecf4f2f8f3 100644
 --- a/src/main/java/net/minecraft/core/EnumDirection.java
 +++ b/src/main/java/net/minecraft/core/EnumDirection.java
 @@ -116,6 +116,7 @@ public enum EnumDirection implements INamable {
diff --git a/patches/server-unmapped/0097-Allow-anvil-colors.patch b/patches/server-unmapped/0096-Allow-anvil-colors.patch
similarity index 100%
rename from patches/server-unmapped/0097-Allow-anvil-colors.patch
rename to patches/server-unmapped/0096-Allow-anvil-colors.patch
diff --git a/patches/server-unmapped/0098-Add-no-random-tick-block-list.patch b/patches/server-unmapped/0097-Add-no-random-tick-block-list.patch
similarity index 94%
rename from patches/server-unmapped/0098-Add-no-random-tick-block-list.patch
rename to patches/server-unmapped/0097-Add-no-random-tick-block-list.patch
index 4afaaa043..15b812110 100644
--- a/patches/server-unmapped/0098-Add-no-random-tick-block-list.patch
+++ b/patches/server-unmapped/0097-Add-no-random-tick-block-list.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add no-random-tick block list
 
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index a0c731af6dffa30832b321f8fd86cef76ec06522..9668619480706cb5d3a3e2ed0d85ac5bdd6b3c1f 100644
+index 6200596f12f4c2b8dec67fc13e02ff95c5608ad0..74245e7f73f69ea843754102b81b26b87c2dc3c8 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
-@@ -532,14 +532,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -329,14 +329,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {
          // CraftBukkit end
          if (com.destroystokyo.paper.PaperConfig.useOptimizedTickList) {
              this.nextTickListBlock = new com.destroystokyo.paper.server.ticklist.PaperTickList<>(this, (block) -> {
@@ -26,10 +26,10 @@ index a0c731af6dffa30832b321f8fd86cef76ec06522..9668619480706cb5d3a3e2ed0d85ac5b
              this.nextTickListFluid = new TickListServer<>(this, (fluidtype) -> {
                  return fluidtype == null || fluidtype == FluidTypes.EMPTY;
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBase.java b/src/main/java/net/minecraft/world/level/block/state/BlockBase.java
-index 1d82f719440c95765c01a588f4785d630b8b527a..0ea0a1fc5f4d879d48bbdf24731dabec10dbccd1 100644
+index 0d26250887f80d0c250bcd6bc7de303362427d3e..a1144a3df0287899ef85bc055e8f02ef0a5d6860 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBase.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBase.java
-@@ -671,10 +671,12 @@ public abstract class BlockBase {
+@@ -615,10 +615,12 @@ public abstract class BlockBase {
          }
  
          public void a(WorldServer worldserver, BlockPosition blockposition, Random random) {
diff --git a/patches/server-unmapped/0099-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server-unmapped/0098-Add-option-to-disable-dolphin-treasure-searching.patch
similarity index 100%
rename from patches/server-unmapped/0099-Add-option-to-disable-dolphin-treasure-searching.patch
rename to patches/server-unmapped/0098-Add-option-to-disable-dolphin-treasure-searching.patch
diff --git a/patches/server-unmapped/0100-Short-enderman-height.patch b/patches/server-unmapped/0099-Short-enderman-height.patch
similarity index 100%
rename from patches/server-unmapped/0100-Short-enderman-height.patch
rename to patches/server-unmapped/0099-Short-enderman-height.patch
diff --git a/patches/server-unmapped/0101-Stop-squids-floating-on-top-of-water.patch b/patches/server-unmapped/0100-Stop-squids-floating-on-top-of-water.patch
similarity index 95%
rename from patches/server-unmapped/0101-Stop-squids-floating-on-top-of-water.patch
rename to patches/server-unmapped/0100-Stop-squids-floating-on-top-of-water.patch
index b9dc85443..bd28d9bee 100644
--- a/patches/server-unmapped/0101-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server-unmapped/0100-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 6dc051e0da0a97bcd9e4cba94c2cabc411ebb86f..fdb7f1b582b791a938451b90914b621347a48189 100644
+index ff07ab36b0e4565ddcaf672e503c2a5740670c2a..0ea8e9a4828689fa1f013590285a65a9841325b7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3590,8 +3590,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -3343,8 +3343,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          this.lastYaw = this.yaw;
      }
  
diff --git a/patches/server-unmapped/0102-Ridables.patch b/patches/server-unmapped/0101-Ridables.patch
similarity index 99%
rename from patches/server-unmapped/0102-Ridables.patch
rename to patches/server-unmapped/0101-Ridables.patch
index 2d836595f..515fb5084 100644
--- a/patches/server-unmapped/0102-Ridables.patch
+++ b/patches/server-unmapped/0101-Ridables.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Ridables
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index afe3c53252354760b22901f7f109fd5d265928e0..aacc1b82ed178d6c0e499a53ce1aec7e20dad875 100644
+index 6afff6ba0c59e3285c99fddf3de738d95153ed24..5c5da6e2be6d3a0ca2fee4e0a5510ccb15fa8020 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1544,6 +1544,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1482,6 +1482,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              WorldServer worldserver = (WorldServer) iterator.next();
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
              worldserver.hasEntityMoveEvent =  EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
@@ -68,7 +68,7 @@ index 0000000000000000000000000000000000000000..8b66d1215a6eef1302b5ecb46a4b3d50
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 38d63449b4ec833ec53de5fe6deebbb3f744492e..b66c50e078d83a1cda0f7010b353ae4b3ba9fd35 100644
+index 996ff0b36379f18af7c68b4c50ea291fe8091970..16b192f251374a477e9696581672515959338d7b 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -80,7 +80,6 @@ import net.minecraft.server.network.PlayerConnection;
@@ -104,10 +104,10 @@ index 38d63449b4ec833ec53de5fe6deebbb3f744492e..b66c50e078d83a1cda0f7010b353ae4b
  
      public void playerTick() {
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index 9668619480706cb5d3a3e2ed0d85ac5bdd6b3c1f..08e4fab02a740bf0c30985e2a858da2ae2caf8d8 100644
+index 74245e7f73f69ea843754102b81b26b87c2dc3c8..a83324f1f4479b5807f7f335b7e63ba1f6bcb057 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
-@@ -216,6 +216,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -215,6 +215,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
      public final UUID uuid;
      public boolean hasPhysicsEvent = true; // Paper
      public boolean hasEntityMoveEvent = false; // Paper
@@ -116,10 +116,10 @@ index 9668619480706cb5d3a3e2ed0d85ac5bdd6b3c1f..08e4fab02a740bf0c30985e2a858da2a
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 10c5af3949af4a3bee4999753e7545f0ac745e63..764ec67150a37f3a18eb1efde9d0c8810a92da6d 100644
+index f92e412d7f49c620699274ecf9ed085c5af53ab8..dc830f1e23b6eb81d47e111e3f4d8d19010b4c9f 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-@@ -2481,6 +2481,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2399,6 +2399,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
                      this.server.getPluginManager().callEvent(event);
  
@@ -149,7 +149,7 @@ index e6bf78f46acc37d9515d58cec3587e236ac0733c..5842d23a536449d0c394c7b23ee0cef3
          this.B = true;
          return this;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb9e8cf400 100644
+index 0ea8e9a4828689fa1f013590285a65a9841325b7..3bbc9d154215437e3db98ad0d10ce43712a70485 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -22,6 +22,7 @@ import net.minecraft.BlockUtil;
@@ -195,7 +195,7 @@ index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb
      private float headHeight;
      // CraftBukkit start
      public boolean persist = true;
-@@ -1618,6 +1618,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -1374,6 +1374,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return !this.justCreated && this.M.getDouble(TagsFluid.LAVA) > 0.0D;
      }
  
@@ -203,7 +203,7 @@ index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb
      public void a(float f, Vec3D vec3d) {
          Vec3D vec3d1 = a(vec3d, f, this.yaw);
  
-@@ -2379,6 +2380,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2132,6 +2133,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return this.a(entity, false);
      }
  
@@ -211,7 +211,7 @@ index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb
      public boolean a(Entity entity, boolean flag) {
          for (Entity entity1 = entity; entity1.vehicle != null; entity1 = entity1.vehicle) {
              if (entity1.vehicle == this) {
-@@ -2474,6 +2476,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2227,6 +2229,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
                  this.passengers.add(entity);
              }
  
@@ -225,7 +225,7 @@ index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb
          }
          return true; // CraftBukkit
      }
-@@ -2514,6 +2523,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2267,6 +2276,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
                  return false;
              }
              // Spigot end
@@ -238,7 +238,7 @@ index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb
              this.passengers.remove(entity);
              entity.j = 60;
          }
-@@ -2680,6 +2695,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2433,6 +2448,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          this.setFlag(4, flag);
      }
  
@@ -246,7 +246,7 @@ index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb
      public boolean bE() {
          return this.glowing || this.world.isClientSide && this.getFlag(6);
      }
-@@ -2902,6 +2918,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2655,6 +2671,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
  
      public void setHeadRotation(float f) {}
  
@@ -254,7 +254,7 @@ index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb
      public void n(float f) {}
  
      public boolean bL() {
-@@ -3343,6 +3360,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -3096,6 +3113,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return false;
      }
  
@@ -273,7 +273,7 @@ index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb
      @Override
      public void sendMessage(IChatBaseComponent ichatbasecomponent, UUID uuid) {}
  
-@@ -3795,4 +3824,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -3542,4 +3571,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return ((ChunkProviderServer) world.getChunkProvider()).isInEntityTickingChunk(this);
      }
      // Paper end
@@ -322,7 +322,7 @@ index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-index fdc1b99f0a032a76a02ee88b28d62e049a2fc54c..0ee99a2c9a966eaaaf09879cce2f54bc68eb3151 100644
+index 6ea0fc81efe976c2b33cc12de175b357323b9cfd..b26b6cf0a1a5b3d0c636cdd734437ed19642ea98 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 @@ -46,8 +46,6 @@ import net.minecraft.world.entity.ai.sensing.EntitySenses;
@@ -387,7 +387,7 @@ index fdc1b99f0a032a76a02ee88b28d62e049a2fc54c..0ee99a2c9a966eaaaf09879cce2f54bc
      public void v(float f) {
          this.aR = f;
      }
-@@ -1326,7 +1327,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1320,7 +1321,7 @@ public abstract class EntityInsentient extends EntityLiving {
      protected void a(EntityHuman entityhuman, EntityInsentient entityinsentient) {}
  
      protected EnumInteractionResult b(EntityHuman entityhuman, EnumHand enumhand) {
@@ -396,7 +396,7 @@ index fdc1b99f0a032a76a02ee88b28d62e049a2fc54c..0ee99a2c9a966eaaaf09879cce2f54bc
      }
  
      public boolean ev() {
-@@ -1707,4 +1708,54 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1701,4 +1702,54 @@ public abstract class EntityInsentient extends EntityLiving {
          this.unleash(true, event.isDropLeash());
          // Paper end
      }
@@ -452,7 +452,7 @@ index fdc1b99f0a032a76a02ee88b28d62e049a2fc54c..0ee99a2c9a966eaaaf09879cce2f54bc
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 1140fc3cade24320bbc3e09a8664ded27df604fe..3b66833adcd3912ebbfac49f0a59b1dc6fb3971d 100644
+index 50b64ab1cbc1940d2f8b5d938e41f5a31830da5b..a1a8441e26ce1414b2406f9be559eeb3a34453d9 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -558,7 +558,7 @@ public abstract class EntityLiving extends Entity {
@@ -914,7 +914,7 @@ index 1d1f71a995a99b2101891a7a5bda7bec5d67f118..bcd510e0bf647a240edfaac1348119c5
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/EntityCat.java b/src/main/java/net/minecraft/world/entity/animal/EntityCat.java
-index c8f529b3fd227ce3354f442038b27cd716f57254..bac3035e2382df2d79e592b02395753eee08fa4b 100644
+index 054a1a74c48a3d936e45cc6b62a9fd6a90663cbc..0ec711f8f1d103d24899854f8cbcd261a66f26fc 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/EntityCat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/EntityCat.java
 @@ -14,6 +14,7 @@ import net.minecraft.network.syncher.DataWatcher;
@@ -2997,7 +2997,7 @@ index f1065c2a37835d760fb57194f7edfd029f426b48..3f2065e2939be54639f44501f7aa8ee5
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
-index 3fff101637708a1a12f9a457bd3512ae94a8f884..b2d1a0144353a1da61221b59a0acc028b0cf746e 100644
+index 58b9ace88793d1f661b16db1b43433484a697936..ad7a9e43e4031054267bb2d18c97d79ce7b16c75 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
 @@ -23,6 +23,7 @@ import net.minecraft.world.entity.Entity;
@@ -3147,7 +3147,7 @@ index 3fff101637708a1a12f9a457bd3512ae94a8f884..b2d1a0144353a1da61221b59a0acc028
                          this.bF.b(this);
                      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java b/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
-index 3cfe3173f710fc54ec77a47a9cbb8f5ff6a6f0b6..9ffac9aa79dee1b6dd6eeb8483b5a81416c11d9b 100644
+index 635b1493eeb6c13cc5ef489bd747ac557bc131d8..8afb710441466918a7c97bd1daffafc48899decc 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
 @@ -12,6 +12,7 @@ import net.minecraft.network.chat.IChatBaseComponent;
@@ -5525,7 +5525,7 @@ index 8df4d985e3124ddc1643da8385b15348937bc320..6c390fb20c7f29133a60780a75676d8d
                      this.setTradingPlayer(entityhuman);
                      this.openTrade(entityhuman, this.getScoreboardDisplayName(), 1);
 diff --git a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
-index f9ce15aa4a2b1ee07f9c31b793410a4ff27ec829..ba8add51b86fc8a6417c1a9ac7a97ac605a9939b 100644
+index 98a27249164be967512e7e745c20e80c80d3c5c8..92c086d276662d2de5c8f136a998384d54390b72 100644
 --- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
 +++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
 @@ -111,7 +111,6 @@ import net.minecraft.world.phys.AxisAlignedBB;
@@ -5545,7 +5545,7 @@ index f9ce15aa4a2b1ee07f9c31b793410a4ff27ec829..ba8add51b86fc8a6417c1a9ac7a97ac6
      private javax.script.ScriptEngine scriptEngine = new javax.script.ScriptEngineManager().getEngineByName("rhino");
  
      public void setAfk(boolean setAfk){
-@@ -2265,4 +2266,15 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -2259,4 +2260,15 @@ public abstract class EntityHuman extends EntityLiving {
              return this.g;
          }
      }
@@ -5616,10 +5616,10 @@ index 96efd974f1eb9c1e7c70e576e51ed69e15aacb99..fc86ef53c48503139667f7703019a07c
  
      default int getHeight() {
 diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
-index 137583da4926ce85d258fce98c919618d02a5f77..b6b4e759975776afcb9d33e650774b9e30d7eb96 100644
+index 2c4bfc663c31e72706eedd4db4533db5a50456db..d55a139f91905e8a2af125b4eeee05c957feae0a 100644
 --- a/src/main/java/net/minecraft/world/level/World.java
 +++ b/src/main/java/net/minecraft/world/level/World.java
-@@ -1748,5 +1748,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1547,5 +1547,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      public boolean isTheEnd() {
          return getWorld().getEnvironment() == org.bukkit.World.Environment.THE_END;
      }
@@ -5631,10 +5631,10 @@ index 137583da4926ce85d258fce98c919618d02a5f77..b6b4e759975776afcb9d33e650774b9e
      // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/phys/Vec3D.java b/src/main/java/net/minecraft/world/phys/Vec3D.java
-index a19a26a88f247d359354902efeece9923f3e0e0b..1119f60890784d953c2cd4e0078af4d04d10d557 100644
+index b71e119eed6fa283d99dc033144c8be7b336d9c4..df6358d07ecad978383b679e7d03cdb2039de452 100644
 --- a/src/main/java/net/minecraft/world/phys/Vec3D.java
 +++ b/src/main/java/net/minecraft/world/phys/Vec3D.java
-@@ -50,6 +50,7 @@ public class Vec3D implements IPosition {
+@@ -44,6 +44,7 @@ public class Vec3D implements IPosition {
          return new Vec3D(vec3d.x - this.x, vec3d.y - this.y, vec3d.z - this.z);
      }
  
@@ -5642,7 +5642,7 @@ index a19a26a88f247d359354902efeece9923f3e0e0b..1119f60890784d953c2cd4e0078af4d0
      public Vec3D d() {
          double d0 = (double) MathHelper.sqrt(this.x * this.x + this.y * this.y + this.z * this.z);
  
-@@ -109,6 +110,7 @@ public class Vec3D implements IPosition {
+@@ -102,6 +103,7 @@ public class Vec3D implements IPosition {
          return d3 * d3 + d4 * d4 + d5 * d5;
      }
  
@@ -5650,7 +5650,7 @@ index a19a26a88f247d359354902efeece9923f3e0e0b..1119f60890784d953c2cd4e0078af4d0
      public Vec3D a(double d0) {
          return this.d(d0, d0, d0);
      }
-@@ -117,6 +119,7 @@ public class Vec3D implements IPosition {
+@@ -110,6 +112,7 @@ public class Vec3D implements IPosition {
          return this.d(vec3d.x, vec3d.y, vec3d.z);
      }
  
@@ -6972,7 +6972,7 @@ index 0000000000000000000000000000000000000000..c7cd0327084943dcb6339998805e6b7d
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index dee4d12a49468d38f077784b219199f0070786f2..dcdc82b42689b4962323938a62cf7ded49afd6f4 100644
+index 295ffab08672d77d88aca368cb5b56f80bc4f1b5..701063a90492131a51007a9f70dbb72e31d016b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -12,9 +12,6 @@ import net.minecraft.nbt.NBTBase;
@@ -6993,7 +6993,7 @@ index dee4d12a49468d38f077784b219199f0070786f2..dcdc82b42689b4962323938a62cf7ded
  import net.minecraft.world.phys.AxisAlignedBB;
  import org.bukkit.Chunk; // Paper
  import org.bukkit.EntityEffect;
-@@ -1175,4 +1171,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1166,4 +1162,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return getHandle().isTicking();
      }
      // Paper end
diff --git a/patches/server-unmapped/0103-Use-configured-height-for-nether-surface-builders.patch b/patches/server-unmapped/0102-Use-configured-height-for-nether-surface-builders.patch
similarity index 100%
rename from patches/server-unmapped/0103-Use-configured-height-for-nether-surface-builders.patch
rename to patches/server-unmapped/0102-Use-configured-height-for-nether-surface-builders.patch
diff --git a/patches/server-unmapped/0104-Crying-obsidian-valid-for-portal-frames.patch b/patches/server-unmapped/0103-Crying-obsidian-valid-for-portal-frames.patch
similarity index 96%
rename from patches/server-unmapped/0104-Crying-obsidian-valid-for-portal-frames.patch
rename to patches/server-unmapped/0103-Crying-obsidian-valid-for-portal-frames.patch
index bc274af40..01a0cc09e 100644
--- a/patches/server-unmapped/0104-Crying-obsidian-valid-for-portal-frames.patch
+++ b/patches/server-unmapped/0103-Crying-obsidian-valid-for-portal-frames.patch
@@ -17,10 +17,10 @@ index cfdc602947548970b3fde00dd9fddf4e82c28841..4e0b88e26ad8017d93841c4149a1687c
          return this == block;
      }
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBase.java b/src/main/java/net/minecraft/world/level/block/state/BlockBase.java
-index 0ea0a1fc5f4d879d48bbdf24731dabec10dbccd1..df595dc52858807479584ce8da49390a25695990 100644
+index a1144a3df0287899ef85bc055e8f02ef0a5d6860..e0a6e2b975889a784c239fab18e70403dec937bc 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBase.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBase.java
-@@ -742,6 +742,7 @@ public abstract class BlockBase {
+@@ -686,6 +686,7 @@ public abstract class BlockBase {
          }
  
          public final boolean isSameInstance(Block block) { return a(block); } // Paper - OBFHELPER
diff --git a/patches/server-unmapped/0105-Entities-can-use-portals-configuration.patch b/patches/server-unmapped/0104-Entities-can-use-portals-configuration.patch
similarity index 93%
rename from patches/server-unmapped/0105-Entities-can-use-portals-configuration.patch
rename to patches/server-unmapped/0104-Entities-can-use-portals-configuration.patch
index 7259c7a25..f81f90aa8 100644
--- a/patches/server-unmapped/0105-Entities-can-use-portals-configuration.patch
+++ b/patches/server-unmapped/0104-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 6d17a5f75e073acccabbad65b998b4eb9e8cf400..e2de4d53e90b30f46a477c995505ac9f48cac842 100644
+index 3bbc9d154215437e3db98ad0d10ce43712a70485..aeaac4221e1c235d89e872da4c1aaaa68ab70a48 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2555,7 +2555,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2308,7 +2308,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
      public void d(BlockPosition blockposition) {
          if (this.ai()) {
              this.resetPortalCooldown();
@@ -17,7 +17,7 @@ index 6d17a5f75e073acccabbad65b998b4eb9e8cf400..e2de4d53e90b30f46a477c995505ac9f
              if (!this.world.isClientSide && !blockposition.equals(this.ac)) {
                  this.ac = blockposition.immutableCopy();
              }
-@@ -3136,7 +3136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2889,7 +2889,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
      }
  
      public boolean canPortal() {
diff --git a/patches/server-unmapped/0106-LivingEntity-broadcastItemBreak.patch b/patches/server-unmapped/0105-LivingEntity-broadcastItemBreak.patch
similarity index 100%
rename from patches/server-unmapped/0106-LivingEntity-broadcastItemBreak.patch
rename to patches/server-unmapped/0105-LivingEntity-broadcastItemBreak.patch
diff --git a/patches/server-unmapped/0107-Customizable-wither-health-and-healing.patch b/patches/server-unmapped/0106-Customizable-wither-health-and-healing.patch
similarity index 97%
rename from patches/server-unmapped/0107-Customizable-wither-health-and-healing.patch
rename to patches/server-unmapped/0106-Customizable-wither-health-and-healing.patch
index 08e25ec5b..a66cb31ac 100644
--- a/patches/server-unmapped/0107-Customizable-wither-health-and-healing.patch
+++ b/patches/server-unmapped/0106-Customizable-wither-health-and-healing.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Customizable wither health and healing
 Adds the ability to customize the health of the wither, as well as the amount that it heals, and how often.
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java b/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
-index 9ffac9aa79dee1b6dd6eeb8483b5a81416c11d9b..528161748472b0fb84718268800864e94ceaa079 100644
+index 8afb710441466918a7c97bd1daffafc48899decc..0c631868c7e7bade389e907e5657d76172590cac 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
 @@ -205,6 +205,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
diff --git a/patches/server-unmapped/0108-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server-unmapped/0107-Allow-toggling-special-MobSpawners-per-world.patch
similarity index 94%
rename from patches/server-unmapped/0108-Allow-toggling-special-MobSpawners-per-world.patch
rename to patches/server-unmapped/0107-Allow-toggling-special-MobSpawners-per-world.patch
index 5a9411e20..713ec0fe8 100644
--- a/patches/server-unmapped/0108-Allow-toggling-special-MobSpawners-per-world.patch
+++ b/patches/server-unmapped/0107-Allow-toggling-special-MobSpawners-per-world.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world
 In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this.
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index 08e4fab02a740bf0c30985e2a858da2ae2caf8d8..d4df33c7cb47c10987431b7c863d429d2a9e82bc 100644
+index a83324f1f4479b5807f7f335b7e63ba1f6bcb057..5567d12b2b74b0fcf17e600d2c7b8ab88c2f3b13 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -92,6 +92,7 @@ import net.minecraft.world.entity.EnumCreatureType;
@@ -35,7 +35,7 @@ index 08e4fab02a740bf0c30985e2a858da2ae2caf8d8..d4df33c7cb47c10987431b7c863d429d
  import net.minecraft.world.level.levelgen.feature.StructureGenerator;
  import net.minecraft.world.level.levelgen.structure.StructureBoundingBox;
  import net.minecraft.world.level.levelgen.structure.StructureStart;
-@@ -550,7 +555,24 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -347,7 +352,24 @@ public class WorldServer extends World implements GeneratorAccessSeed {
          this.L = new ObjectLinkedOpenHashSet();
          this.Q = flag1;
          this.server = minecraftserver;
@@ -93,13 +93,13 @@ index 7c8a2151be8a0f48cba1c15d231d5dbdb500b4d6..361771fc4fcf16b1b013c55073401953
              if (SpawnerCreature.a(EntityPositionTypes.Surface.ON_GROUND, iworldreader, blockposition2, EntityTypes.WANDERING_TRADER)) {
                  blockposition1 = blockposition2;
 diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
-index b6b4e759975776afcb9d33e650774b9e30d7eb96..a3215b1cccf4d00de888ca4696c03ffb6adf7041 100644
+index d55a139f91905e8a2af125b4eeee05c957feae0a..ea40c3d862acdea4d02b234ae5039204a415df20 100644
 --- a/src/main/java/net/minecraft/world/level/World.java
 +++ b/src/main/java/net/minecraft/world/level/World.java
-@@ -255,7 +255,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -200,7 +200,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+         this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.WorldDataServer) worlddatamutable).getName()); // Spigot
          this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((net.minecraft.world.level.storage.WorldDataServer) worlddatamutable).getName(), this.spigotConfig); // Paper
          this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this, executor) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
-         this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConfig(((net.minecraft.world.level.storage.WorldDataServer)worlddatamutable).getName()); // Tuinity - Server Config
 -        this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((((net.minecraft.world.level.storage.WorldDataServer)worlddatamutable).getName())); // Purpur
 +        this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((((net.minecraft.world.level.storage.WorldDataServer)worlddatamutable).getName()), env); // Purpur
          this.generator = gen;
diff --git a/patches/server-unmapped/0109-Raid-cooldown-setting.patch b/patches/server-unmapped/0108-Raid-cooldown-setting.patch
similarity index 100%
rename from patches/server-unmapped/0109-Raid-cooldown-setting.patch
rename to patches/server-unmapped/0108-Raid-cooldown-setting.patch
diff --git a/patches/server-unmapped/0110-Despawn-rate-config-options-per-projectile-type.patch b/patches/server-unmapped/0109-Despawn-rate-config-options-per-projectile-type.patch
similarity index 99%
rename from patches/server-unmapped/0110-Despawn-rate-config-options-per-projectile-type.patch
rename to patches/server-unmapped/0109-Despawn-rate-config-options-per-projectile-type.patch
index c585d886f..1cb7762bf 100644
--- a/patches/server-unmapped/0110-Despawn-rate-config-options-per-projectile-type.patch
+++ b/patches/server-unmapped/0109-Despawn-rate-config-options-per-projectile-type.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Despawn rate config options per projectile type
 Default values of -1 respect vanilla behaviour.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java b/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
-index 42c1a7e8d51868c74e92d97f1df8d36fcaab6252..5775a28cb9d94b94b6e6bbc810fe31260810632e 100644
+index b0e8e9934edbb0cf7ac063e4903452be526afbc7..d4d45655ed84d4b35e624a97b64f269e39c99e08 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
 @@ -61,7 +61,7 @@ public abstract class EntityArrow extends IProjectile {
diff --git a/patches/server-unmapped/0111-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server-unmapped/0110-Add-option-to-disable-zombie-aggressiveness-towards-.patch
similarity index 100%
rename from patches/server-unmapped/0111-Add-option-to-disable-zombie-aggressiveness-towards-.patch
rename to patches/server-unmapped/0110-Add-option-to-disable-zombie-aggressiveness-towards-.patch
diff --git a/patches/server-unmapped/0112-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/server-unmapped/0111-Persistent-TileEntity-Lore-and-DisplayName.patch
similarity index 100%
rename from patches/server-unmapped/0112-Persistent-TileEntity-Lore-and-DisplayName.patch
rename to patches/server-unmapped/0111-Persistent-TileEntity-Lore-and-DisplayName.patch
diff --git a/patches/server-unmapped/0113-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server-unmapped/0112-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
similarity index 100%
rename from patches/server-unmapped/0113-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
rename to patches/server-unmapped/0112-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
diff --git a/patches/server-unmapped/0114-Flying-squids-Oh-my.patch b/patches/server-unmapped/0113-Flying-squids-Oh-my.patch
similarity index 100%
rename from patches/server-unmapped/0114-Flying-squids-Oh-my.patch
rename to patches/server-unmapped/0113-Flying-squids-Oh-my.patch
diff --git a/patches/server-unmapped/0115-Infinity-bow-settings.patch b/patches/server-unmapped/0114-Infinity-bow-settings.patch
similarity index 100%
rename from patches/server-unmapped/0115-Infinity-bow-settings.patch
rename to patches/server-unmapped/0114-Infinity-bow-settings.patch
diff --git a/patches/server-unmapped/0116-Stonecutter-damage.patch b/patches/server-unmapped/0115-Stonecutter-damage.patch
similarity index 85%
rename from patches/server-unmapped/0116-Stonecutter-damage.patch
rename to patches/server-unmapped/0115-Stonecutter-damage.patch
index 574daef97..0460bfaa6 100644
--- a/patches/server-unmapped/0116-Stonecutter-damage.patch
+++ b/patches/server-unmapped/0115-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 e2de4d53e90b30f46a477c995505ac9f48cac842..b15f117d64d4e6a1dccdda480417b6f092c161ec 100644
+index aeaac4221e1c235d89e872da4c1aaaa68ab70a48..5fd01caa85eedc2e703b76fd230762cc89fceb21 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -890,7 +890,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -802,7 +802,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
              }
              // CraftBukkit end
  
@@ -39,16 +39,16 @@ index 54c9586cd7f8c9691a1c7ded9c9c96b0f316b0b6..68c6f090a10564a790f3bf175e2378d1
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/level/pathfinder/PathfinderNormal.java b/src/main/java/net/minecraft/world/level/pathfinder/PathfinderNormal.java
-index 7b92a54cfb64fb77af99e6bf66eacbdb9e769dc1..9d08094165cf18d99116b5c721fff888f3cb42e2 100644
+index a0c7d3ab747ba1a3cf07e716f3591663a8a9e14b..1fb27ca3e769c34b98c9b2d973f4da16f17b022d 100644
 --- a/src/main/java/net/minecraft/world/level/pathfinder/PathfinderNormal.java
 +++ b/src/main/java/net/minecraft/world/level/pathfinder/PathfinderNormal.java
-@@ -503,7 +503,7 @@ public class PathfinderNormal extends PathfinderAbstract {
-                             return iblockdata.neighbourOverridePathType = PathType.DANGER_CACTUS; // Tuinity - reduce pathfinder branching
+@@ -490,7 +490,7 @@ public class PathfinderNormal extends PathfinderAbstract {
+                             return PathType.DANGER_CACTUS;
                          }
  
 -                        if (iblockdata.a(Blocks.SWEET_BERRY_BUSH)) {
 +                        if (iblockdata.a(Blocks.SWEET_BERRY_BUSH) || iblockdata.a(Blocks.STONECUTTER)) { // Purpur
-                             return iblockdata.neighbourOverridePathType = PathType.DANGER_OTHER; // Tuinity - reduce pathfinder branching
+                             return PathType.DANGER_OTHER;
                          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
diff --git a/patches/server-unmapped/0117-Configurable-daylight-cycle.patch b/patches/server-unmapped/0116-Configurable-daylight-cycle.patch
similarity index 91%
rename from patches/server-unmapped/0117-Configurable-daylight-cycle.patch
rename to patches/server-unmapped/0116-Configurable-daylight-cycle.patch
index 60e99ea96..c62ecb53f 100644
--- a/patches/server-unmapped/0117-Configurable-daylight-cycle.patch
+++ b/patches/server-unmapped/0116-Configurable-daylight-cycle.patch
@@ -18,7 +18,7 @@ index 3086ee023685781d94e2fb99fc8dff5264f01165..74c1047305cac5673e274096709c757e
      public PacketPlayOutUpdateTime() {}
  
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index d4df33c7cb47c10987431b7c863d429d2a9e82bc..ab0e16b8f659ff86f022fef210b97dfa59206b0c 100644
+index 5567d12b2b74b0fcf17e600d2c7b8ab88c2f3b13..9276500e4cc2a0d2d374b3f1393410e8295b3b4d 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -64,6 +64,7 @@ import net.minecraft.network.protocol.game.PacketPlayOutExplosion;
@@ -29,7 +29,7 @@ index d4df33c7cb47c10987431b7c863d429d2a9e82bc..ab0e16b8f659ff86f022fef210b97dfa
  import net.minecraft.network.protocol.game.PacketPlayOutWorldEvent;
  import net.minecraft.network.protocol.game.PacketPlayOutWorldParticles;
  import net.minecraft.resources.MinecraftKey;
-@@ -213,6 +214,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -212,6 +213,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
      private final EnderDragonBattle dragonBattle;
      private final StructureManager structureManager;
      private final boolean Q;
@@ -37,15 +37,15 @@ index d4df33c7cb47c10987431b7c863d429d2a9e82bc..ab0e16b8f659ff86f022fef210b97dfa
  
  
      // CraftBukkit start
-@@ -604,6 +606,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -401,6 +403,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
          this.getServer().addWorld(this.getWorld()); // CraftBukkit
  
          this.asyncChunkTaskManager = new com.destroystokyo.paper.io.chunk.ChunkTaskManager(this); // Paper
 +        this.fakeTime = this.worldDataServer.getDayTime(); // Purpur
      }
  
-     // Tuinity start - optimise collision
-@@ -1190,7 +1193,21 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+     // CraftBukkit start
+@@ -718,7 +721,21 @@ public class WorldServer extends World implements GeneratorAccessSeed {
              this.nextTickListBlock.nextTick(); // Paper
              this.nextTickListFluid.nextTick(); // Paper
              this.worldDataServer.u().a(this.server, i);
@@ -68,7 +68,7 @@ index d4df33c7cb47c10987431b7c863d429d2a9e82bc..ab0e16b8f659ff86f022fef210b97dfa
                  this.setDayTime(this.worldData.getDayTime() + 1L);
              }
  
-@@ -1199,6 +1216,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -727,6 +744,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
  
      public void setDayTime(long i) {
          this.worldDataServer.setDayTime(i);
diff --git a/patches/server-unmapped/0118-Allow-infinite-and-mending-enchantments-together.patch b/patches/server-unmapped/0117-Allow-infinite-and-mending-enchantments-together.patch
similarity index 100%
rename from patches/server-unmapped/0118-Allow-infinite-and-mending-enchantments-together.patch
rename to patches/server-unmapped/0117-Allow-infinite-and-mending-enchantments-together.patch
diff --git a/patches/server-unmapped/0119-Infinite-fuel-furnace.patch b/patches/server-unmapped/0118-Infinite-fuel-furnace.patch
similarity index 100%
rename from patches/server-unmapped/0119-Infinite-fuel-furnace.patch
rename to patches/server-unmapped/0118-Infinite-fuel-furnace.patch
diff --git a/patches/server-unmapped/0120-Arrows-should-not-reset-despawn-counter.patch b/patches/server-unmapped/0119-Arrows-should-not-reset-despawn-counter.patch
similarity index 91%
rename from patches/server-unmapped/0120-Arrows-should-not-reset-despawn-counter.patch
rename to patches/server-unmapped/0119-Arrows-should-not-reset-despawn-counter.patch
index e0af66b86..e49ddc72f 100644
--- a/patches/server-unmapped/0120-Arrows-should-not-reset-despawn-counter.patch
+++ b/patches/server-unmapped/0119-Arrows-should-not-reset-despawn-counter.patch
@@ -7,7 +7,7 @@ This prevents keeping arrows alive indefinitely (such as when the block
 the arrow is stuck in gets removed, like a piston head going up/down)
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java b/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
-index 5775a28cb9d94b94b6e6bbc810fe31260810632e..7861b9e28b0fcc7ab931498fc7c96404456b9998 100644
+index d4d45655ed84d4b35e624a97b64f269e39c99e08..6edf1736aec571c74e5b4a6cbe7b58fe809419c3 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
 @@ -281,7 +281,7 @@ public abstract class EntityArrow extends IProjectile {
diff --git a/patches/server-unmapped/0121-Add-tablist-suffix-option-for-afk.patch b/patches/server-unmapped/0120-Add-tablist-suffix-option-for-afk.patch
similarity index 93%
rename from patches/server-unmapped/0121-Add-tablist-suffix-option-for-afk.patch
rename to patches/server-unmapped/0120-Add-tablist-suffix-option-for-afk.patch
index 0db8004f3..594ea9fd5 100644
--- a/patches/server-unmapped/0121-Add-tablist-suffix-option-for-afk.patch
+++ b/patches/server-unmapped/0120-Add-tablist-suffix-option-for-afk.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add tablist suffix option for afk
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index b66c50e078d83a1cda0f7010b353ae4b3ba9fd35..7b11b5fedd0dd6b340362c26b4ce73b93bf57b8b 100644
+index 16b192f251374a477e9696581672515959338d7b..6238469d8e973ca675bb02988d3324e5c5830b42 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -2152,7 +2152,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1962,7 +1962,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
  
          if (world.purpurConfig.idleTimeoutUpdateTabList) {
diff --git a/patches/server-unmapped/0122-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server-unmapped/0121-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
similarity index 95%
rename from patches/server-unmapped/0122-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
rename to patches/server-unmapped/0121-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
index 538d194ee..a4c3052aa 100644
--- a/patches/server-unmapped/0122-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
+++ b/patches/server-unmapped/0121-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ability to re-add farmland mechanics from Alpha
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BlockSoil.java b/src/main/java/net/minecraft/world/level/block/BlockSoil.java
-index 50cf0f3a67a32fe221afaee095189de87135f355..f00eb3cda60f6f8b2534c3da5ffaa6faee334663 100644
+index 2bbaa2fb426869223a9b2f07406496c1b0daff3f..3e8893bf76b8ffda4c595c81086556ea929beaa4 100644
 --- a/src/main/java/net/minecraft/world/level/block/BlockSoil.java
 +++ b/src/main/java/net/minecraft/world/level/block/BlockSoil.java
 @@ -113,6 +113,14 @@ public class BlockSoil extends Block {
diff --git a/patches/server-unmapped/0123-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server-unmapped/0122-Add-adjustable-breeding-cooldown-to-config.patch
similarity index 94%
rename from patches/server-unmapped/0123-Add-adjustable-breeding-cooldown-to-config.patch
rename to patches/server-unmapped/0122-Add-adjustable-breeding-cooldown-to-config.patch
index 619b2e5ea..9fdd10e7f 100644
--- a/patches/server-unmapped/0123-Add-adjustable-breeding-cooldown-to-config.patch
+++ b/patches/server-unmapped/0122-Add-adjustable-breeding-cooldown-to-config.patch
@@ -33,7 +33,7 @@ index 4de0a733819d408e8b9a55b604f455281d7732c5..94b5874c1eb90c02a557179a2a1170b1
              entityageable.setBaby(true);
              entityageable.setPositionRotation(this.locX(), this.locY(), this.locZ(), 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
-index a3215b1cccf4d00de888ca4696c03ffb6adf7041..cb58d2635650c20da21583ead18e9f380323205b 100644
+index ea40c3d862acdea4d02b234ae5039204a415df20..dd0dabc36de2ae01d631e46795071f8ec3477f5a 100644
 --- a/src/main/java/net/minecraft/world/level/World.java
 +++ b/src/main/java/net/minecraft/world/level/World.java
 @@ -41,6 +41,7 @@ import net.minecraft.world.DifficultyDamageScaler;
@@ -44,7 +44,7 @@ index a3215b1cccf4d00de888ca4696c03ffb6adf7041..cb58d2635650c20da21583ead18e9f38
  import net.minecraft.world.entity.decoration.EntityArmorStand;
  import net.minecraft.world.entity.player.EntityHuman;
  import net.minecraft.world.item.ItemStack;
-@@ -164,6 +165,48 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -167,6 +168,48 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      private int tileTickPosition;
      public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
      public java.util.ArrayDeque<BlockRedstoneTorch.RedstoneUpdateInfo> redstoneUpdateInfos; // Paper - Move from Map in BlockRedstoneTorch to here
@@ -93,9 +93,9 @@ index a3215b1cccf4d00de888ca4696c03ffb6adf7041..cb58d2635650c20da21583ead18e9f38
  
      public CraftWorld getWorld() {
          return this.world;
-@@ -256,6 +299,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -201,6 +244,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+         this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((net.minecraft.world.level.storage.WorldDataServer) worlddatamutable).getName(), this.spigotConfig); // Paper
          this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this, executor) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
-         this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConfig(((net.minecraft.world.level.storage.WorldDataServer)worlddatamutable).getName()); // Tuinity - Server Config
          this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((((net.minecraft.world.level.storage.WorldDataServer)worlddatamutable).getName()), env); // Purpur
 +        this.playerBreedingCooldowns = this.getNewBreedingCooldownCache(); // Purpur
          this.generator = gen;
diff --git a/patches/server-unmapped/0124-Make-entity-breeding-times-configurable.patch b/patches/server-unmapped/0123-Make-entity-breeding-times-configurable.patch
similarity index 99%
rename from patches/server-unmapped/0124-Make-entity-breeding-times-configurable.patch
rename to patches/server-unmapped/0123-Make-entity-breeding-times-configurable.patch
index 367ef4e7c..b5031b977 100644
--- a/patches/server-unmapped/0124-Make-entity-breeding-times-configurable.patch
+++ b/patches/server-unmapped/0123-Make-entity-breeding-times-configurable.patch
@@ -63,7 +63,7 @@ index bcd510e0bf647a240edfaac1348119c5e1d7dc42..6086dda5b06f0c0e02734edf7141b137
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/EntityCat.java b/src/main/java/net/minecraft/world/entity/animal/EntityCat.java
-index bac3035e2382df2d79e592b02395753eee08fa4b..187047de5530ccec1e9804f8039839246ab248f3 100644
+index 0ec711f8f1d103d24899854f8cbcd261a66f26fc..25b0d4ebb45ffa5579921e6966c63eff1e043b85 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/EntityCat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/EntityCat.java
 @@ -122,6 +122,11 @@ public class EntityCat extends EntityTameableAnimal {
diff --git a/patches/server-unmapped/0125-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server-unmapped/0124-Apply-display-names-from-item-forms-of-entities-to-e.patch
similarity index 100%
rename from patches/server-unmapped/0125-Apply-display-names-from-item-forms-of-entities-to-e.patch
rename to patches/server-unmapped/0124-Apply-display-names-from-item-forms-of-entities-to-e.patch
diff --git a/patches/server-unmapped/0126-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server-unmapped/0125-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
similarity index 100%
rename from patches/server-unmapped/0126-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
rename to patches/server-unmapped/0125-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
diff --git a/patches/server-unmapped/0127-Add-twisting-and-weeping-vines-growth-rates.patch b/patches/server-unmapped/0126-Add-twisting-and-weeping-vines-growth-rates.patch
similarity index 100%
rename from patches/server-unmapped/0127-Add-twisting-and-weeping-vines-growth-rates.patch
rename to patches/server-unmapped/0126-Add-twisting-and-weeping-vines-growth-rates.patch
diff --git a/patches/server-unmapped/0128-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server-unmapped/0127-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
similarity index 100%
rename from patches/server-unmapped/0128-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
rename to patches/server-unmapped/0127-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
diff --git a/patches/server-unmapped/0129-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server-unmapped/0128-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
similarity index 100%
rename from patches/server-unmapped/0129-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
rename to patches/server-unmapped/0128-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
diff --git a/patches/server-unmapped/0130-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/server-unmapped/0129-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
similarity index 94%
rename from patches/server-unmapped/0130-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
rename to patches/server-unmapped/0129-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
index 3e51c3000..405b3f04c 100644
--- a/patches/server-unmapped/0130-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
+++ b/patches/server-unmapped/0129-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add critical hit check to EntityDamagedByEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
-index ba8add51b86fc8a6417c1a9ac7a97ac605a9939b..c2a35fac1065b2b67a0a3ce94432246892f6f4a5 100644
+index 92c086d276662d2de5c8f136a998384d54390b72..4bb40046f1f21bdfeaf10961001e90b1724e00bb 100644
 --- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
 +++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
 @@ -169,6 +169,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -16,7 +16,7 @@ index ba8add51b86fc8a6417c1a9ac7a97ac605a9939b..c2a35fac1065b2b67a0a3ce944322468
  
      // CraftBukkit start
      public boolean fauxSleeping;
-@@ -1176,6 +1177,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1170,6 +1171,7 @@ public abstract class EntityHuman extends EntityLiving {
                      flag2 = flag2 && !world.paperConfig.disablePlayerCrits; // Paper
                      flag2 = flag2 && !this.isSprinting();
                      if (flag2) {
@@ -24,7 +24,7 @@ index ba8add51b86fc8a6417c1a9ac7a97ac605a9939b..c2a35fac1065b2b67a0a3ce944322468
                          f *= 1.5F;
                      }
  
-@@ -1212,6 +1214,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1206,6 +1208,7 @@ public abstract class EntityHuman extends EntityLiving {
  
                      Vec3D vec3d = entity.getMot();
                      boolean flag5 = entity.damageEntity(DamageSource.playerAttack(this), f);
diff --git a/patches/server-unmapped/0131-Add-configurable-snowball-damage.patch b/patches/server-unmapped/0130-Add-configurable-snowball-damage.patch
similarity index 100%
rename from patches/server-unmapped/0131-Add-configurable-snowball-damage.patch
rename to patches/server-unmapped/0130-Add-configurable-snowball-damage.patch
diff --git a/patches/server-unmapped/0132-Zombie-break-door-minimum-difficulty-option.patch b/patches/server-unmapped/0131-Zombie-break-door-minimum-difficulty-option.patch
similarity index 100%
rename from patches/server-unmapped/0132-Zombie-break-door-minimum-difficulty-option.patch
rename to patches/server-unmapped/0131-Zombie-break-door-minimum-difficulty-option.patch
diff --git a/patches/server-unmapped/0133-Add-demo-command.patch b/patches/server-unmapped/0132-Add-demo-command.patch
similarity index 100%
rename from patches/server-unmapped/0133-Add-demo-command.patch
rename to patches/server-unmapped/0132-Add-demo-command.patch
diff --git a/patches/server-unmapped/0134-Left-handed-API.patch b/patches/server-unmapped/0133-Left-handed-API.patch
similarity index 100%
rename from patches/server-unmapped/0134-Left-handed-API.patch
rename to patches/server-unmapped/0133-Left-handed-API.patch
diff --git a/patches/server-unmapped/0136-Changeable-Mob-Left-Handed-Chance.patch b/patches/server-unmapped/0134-Changeable-Mob-Left-Handed-Chance.patch
similarity index 92%
rename from patches/server-unmapped/0136-Changeable-Mob-Left-Handed-Chance.patch
rename to patches/server-unmapped/0134-Changeable-Mob-Left-Handed-Chance.patch
index f9bfd9196..89d26117b 100644
--- a/patches/server-unmapped/0136-Changeable-Mob-Left-Handed-Chance.patch
+++ b/patches/server-unmapped/0134-Changeable-Mob-Left-Handed-Chance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Changeable Mob Left Handed Chance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-index 0ee99a2c9a966eaaaf09879cce2f54bc68eb3151..8c74adf071e1edb640b3f2375bc92567cc2f6086 100644
+index b26b6cf0a1a5b3d0c636cdd734437ed19642ea98..9f6c98a8649b31ef8f5f2e60b1cb2f9f62f70930 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-@@ -1208,7 +1208,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1202,7 +1202,7 @@ public abstract class EntityInsentient extends EntityLiving {
      @Nullable
      public GroupDataEntity prepare(WorldAccess worldaccess, DifficultyDamageScaler difficultydamagescaler, EnumMobSpawn enummobspawn, @Nullable GroupDataEntity groupdataentity, @Nullable NBTTagCompound nbttagcompound) {
          this.getAttributeInstance(GenericAttributes.FOLLOW_RANGE).addModifier(new AttributeModifier("Random spawn bonus", this.random.nextGaussian() * 0.05D, AttributeModifier.Operation.MULTIPLY_BASE));
diff --git a/patches/server-unmapped/0137-Add-boat-fall-damage-config.patch b/patches/server-unmapped/0135-Add-boat-fall-damage-config.patch
similarity index 94%
rename from patches/server-unmapped/0137-Add-boat-fall-damage-config.patch
rename to patches/server-unmapped/0135-Add-boat-fall-damage-config.patch
index 9f711b517..935e53b32 100644
--- a/patches/server-unmapped/0137-Add-boat-fall-damage-config.patch
+++ b/patches/server-unmapped/0135-Add-boat-fall-damage-config.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add boat fall damage config
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 7b11b5fedd0dd6b340362c26b4ce73b93bf57b8b..c631e4d27518a1382869c184af41bec911cce908 100644
+index 6238469d8e973ca675bb02988d3324e5c5830b42..574486804ae64fa870de5499f6955ed13357d616 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -1149,7 +1149,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -970,7 +970,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          if (this.isInvulnerable(damagesource)) {
              return false;
          } else {
diff --git a/patches/server-unmapped/0138-Config-migration-disable-saving-projectiles-to-disk-.patch b/patches/server-unmapped/0136-Config-migration-disable-saving-projectiles-to-disk-.patch
similarity index 100%
rename from patches/server-unmapped/0138-Config-migration-disable-saving-projectiles-to-disk-.patch
rename to patches/server-unmapped/0136-Config-migration-disable-saving-projectiles-to-disk-.patch
diff --git a/patches/server-unmapped/0139-Snow-Golem-rate-of-fire-config.patch b/patches/server-unmapped/0137-Snow-Golem-rate-of-fire-config.patch
similarity index 100%
rename from patches/server-unmapped/0139-Snow-Golem-rate-of-fire-config.patch
rename to patches/server-unmapped/0137-Snow-Golem-rate-of-fire-config.patch
diff --git a/patches/server-unmapped/0140-PaperPR-Config-option-for-Piglins-guarding-chests.patch b/patches/server-unmapped/0138-PaperPR-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server-unmapped/0140-PaperPR-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server-unmapped/0138-PaperPR-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server-unmapped/0141-EMC-Configurable-disable-give-dropping.patch b/patches/server-unmapped/0139-EMC-Configurable-disable-give-dropping.patch
similarity index 100%
rename from patches/server-unmapped/0141-EMC-Configurable-disable-give-dropping.patch
rename to patches/server-unmapped/0139-EMC-Configurable-disable-give-dropping.patch
diff --git a/patches/server-unmapped/0142-Config-migration-climbing-should-not-bypass-cramming.patch b/patches/server-unmapped/0140-Config-migration-climbing-should-not-bypass-cramming.patch
similarity index 100%
rename from patches/server-unmapped/0142-Config-migration-climbing-should-not-bypass-cramming.patch
rename to patches/server-unmapped/0140-Config-migration-climbing-should-not-bypass-cramming.patch
diff --git a/patches/server-unmapped/0143-Lobotomize-stuck-villagers.patch b/patches/server-unmapped/0141-Lobotomize-stuck-villagers.patch
similarity index 96%
rename from patches/server-unmapped/0143-Lobotomize-stuck-villagers.patch
rename to patches/server-unmapped/0141-Lobotomize-stuck-villagers.patch
index dcb81572b..238248e74 100644
--- a/patches/server-unmapped/0143-Lobotomize-stuck-villagers.patch
+++ b/patches/server-unmapped/0141-Lobotomize-stuck-villagers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Lobotomize stuck villagers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b15f117d64d4e6a1dccdda480417b6f092c161ec..ca5afdcc9c5ae7b5f67a2c12f62e89ef5e227e3c 100644
+index 5fd01caa85eedc2e703b76fd230762cc89fceb21..4c427a3950b1418ef6135a288449f5b7f7939701 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -206,7 +206,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
@@ -18,10 +18,10 @@ index b15f117d64d4e6a1dccdda480417b6f092c161ec..ca5afdcc9c5ae7b5f67a2c12f62e89ef
      public float yaw;
      public float pitch;
 diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/NavigationAbstract.java b/src/main/java/net/minecraft/world/entity/ai/navigation/NavigationAbstract.java
-index 148bdbc2cffb002d8b6dd05e70854ab503804949..a1b7ba4f2cef36e9ac7e21c22060090944ba943b 100644
+index e6ba9b7fbf08ae0dd083a1ebee8eb7ed8a937751..1df161b817747f9d21733b8e415da11bfacfbfc7 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/NavigationAbstract.java
-@@ -123,6 +123,7 @@ public abstract class NavigationAbstract {
+@@ -116,6 +116,7 @@ public abstract class NavigationAbstract {
      }
  
      @Nullable
diff --git a/patches/server-unmapped/0144-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server-unmapped/0142-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
similarity index 100%
rename from patches/server-unmapped/0144-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
rename to patches/server-unmapped/0142-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
diff --git a/patches/server-unmapped/0145-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server-unmapped/0143-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
similarity index 100%
rename from patches/server-unmapped/0145-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
rename to patches/server-unmapped/0143-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
diff --git a/patches/server-unmapped/0146-Spread-out-and-optimise-player-list-ticks.patch b/patches/server-unmapped/0144-Spread-out-and-optimise-player-list-ticks.patch
similarity index 92%
rename from patches/server-unmapped/0146-Spread-out-and-optimise-player-list-ticks.patch
rename to patches/server-unmapped/0144-Spread-out-and-optimise-player-list-ticks.patch
index 558b047dc..0391a93d4 100644
--- a/patches/server-unmapped/0146-Spread-out-and-optimise-player-list-ticks.patch
+++ b/patches/server-unmapped/0144-Spread-out-and-optimise-player-list-ticks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spread out and optimise player list ticks
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 80f6a4e7204bceca3f312fe5c8d572f971a7fa4b..62f2033606170248f07f7683688b8a11ca3bd302 100644
+index 1d7685f5373249a6cc950ebd8a75cda53e5680d6..9a41d4ae2a64ba542dd9b6b98b01dd660a43b2dc 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -151,7 +151,7 @@ public abstract class PlayerList {
@@ -17,7 +17,7 @@ index 80f6a4e7204bceca3f312fe5c8d572f971a7fa4b..62f2033606170248f07f7683688b8a11
  
      // CraftBukkit start
      private CraftServer cserver;
-@@ -1029,22 +1029,23 @@ public abstract class PlayerList {
+@@ -1028,22 +1028,23 @@ public abstract class PlayerList {
      }
  
      public void tick() {
@@ -56,7 +56,7 @@ index 80f6a4e7204bceca3f312fe5c8d572f971a7fa4b..62f2033606170248f07f7683688b8a11
  
      public void sendAll(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b7180dea1d71a68e4025388916600093dfd000c7..8cc2b2b83ad3cb74f8cf7916141ae1f4ade27908 100644
+index 45bf2b87518ba81cb4a18a59d11dba9430e63e40..175dfb418f910d6486109073d0a406461a48f7ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1447,7 +1447,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server-unmapped/0147-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server-unmapped/0145-Configurable-chance-for-wolves-to-spawn-rabid.patch
similarity index 99%
rename from patches/server-unmapped/0147-Configurable-chance-for-wolves-to-spawn-rabid.patch
rename to patches/server-unmapped/0145-Configurable-chance-for-wolves-to-spawn-rabid.patch
index 4527c2d84..a4874540f 100644
--- a/patches/server-unmapped/0147-Configurable-chance-for-wolves-to-spawn-rabid.patch
+++ b/patches/server-unmapped/0145-Configurable-chance-for-wolves-to-spawn-rabid.patch
@@ -7,7 +7,7 @@ Configurable chance to spawn a wolf that is rabid.
 Rabid wolves attack all players, mobs, and animals.
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 3b66833adcd3912ebbfac49f0a59b1dc6fb3971d..3b76a652a3888d7d0b7dfb13f9ebbf0732e71d71 100644
+index a1a8441e26ce1414b2406f9be559eeb3a34453d9..65cafb25252aa1d2013311a8fef364b96ee7273c 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -2197,6 +2197,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server-unmapped/0148-Configurable-default-wolf-collar-color.patch b/patches/server-unmapped/0146-Configurable-default-wolf-collar-color.patch
similarity index 100%
rename from patches/server-unmapped/0148-Configurable-default-wolf-collar-color.patch
rename to patches/server-unmapped/0146-Configurable-default-wolf-collar-color.patch
diff --git a/patches/server-unmapped/0149-Configurable-entity-base-attributes.patch b/patches/server-unmapped/0147-Configurable-entity-base-attributes.patch
similarity index 99%
rename from patches/server-unmapped/0149-Configurable-entity-base-attributes.patch
rename to patches/server-unmapped/0147-Configurable-entity-base-attributes.patch
index caec592d4..a093e81cf 100644
--- a/patches/server-unmapped/0149-Configurable-entity-base-attributes.patch
+++ b/patches/server-unmapped/0147-Configurable-entity-base-attributes.patch
@@ -44,7 +44,7 @@ index 6086dda5b06f0c0e02734edf7141b13715420d3c..e425e093c233a21e5ef457e3a94defe8
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/EntityCat.java b/src/main/java/net/minecraft/world/entity/animal/EntityCat.java
-index 187047de5530ccec1e9804f8039839246ab248f3..a4e3e36f081803b0588a0e907a3a834b7a3ab3eb 100644
+index 25b0d4ebb45ffa5579921e6966c63eff1e043b85..b3b26044daaf084b9bdc911f10804bbb852f088c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/EntityCat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/EntityCat.java
 @@ -127,6 +127,11 @@ public class EntityCat extends EntityTameableAnimal {
@@ -705,7 +705,7 @@ index 0fb651bcde1109b0eb30b60226d3512648dceb41..73f59982d70093d308c6dc6a9a569334
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
-index b2d1a0144353a1da61221b59a0acc028b0cf746e..aeff46b575a05145fb509b5e5a489b2067776e2f 100644
+index ad7a9e43e4031054267bb2d18c97d79ce7b16c75..1ac5ce2687aae103e7811fd3bacdf1cbc048c59f 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
 @@ -147,6 +147,11 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
diff --git a/patches/server-unmapped/0150-Phantom-flames-on-swoop.patch b/patches/server-unmapped/0148-Phantom-flames-on-swoop.patch
similarity index 100%
rename from patches/server-unmapped/0150-Phantom-flames-on-swoop.patch
rename to patches/server-unmapped/0148-Phantom-flames-on-swoop.patch
diff --git a/patches/server-unmapped/0151-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server-unmapped/0149-Option-for-chests-to-open-even-with-a-solid-block-on.patch
similarity index 100%
rename from patches/server-unmapped/0151-Option-for-chests-to-open-even-with-a-solid-block-on.patch
rename to patches/server-unmapped/0149-Option-for-chests-to-open-even-with-a-solid-block-on.patch
diff --git a/patches/server-unmapped/0152-Implement-TPSBar.patch b/patches/server-unmapped/0150-Implement-TPSBar.patch
similarity index 94%
rename from patches/server-unmapped/0152-Implement-TPSBar.patch
rename to patches/server-unmapped/0150-Implement-TPSBar.patch
index d86ba5dd0..c65db8a13 100644
--- a/patches/server-unmapped/0152-Implement-TPSBar.patch
+++ b/patches/server-unmapped/0150-Implement-TPSBar.patch
@@ -17,10 +17,10 @@ index 0ea56c863a9a1019b36f7f9f9164301aef12637b..4338b459011bf7a083790b7bb76cf1b2
  
          if (commanddispatcher_servertype.d) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index aacc1b82ed178d6c0e499a53ce1aec7e20dad875..ee75fe091f7fd28426b9af329358ea0deb24d589 100644
+index 5c5da6e2be6d3a0ca2fee4e0a5510ccb15fa8020..ab49314a0b2fb70bab879be2adcf938bb43c5dcb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -993,6 +993,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -991,6 +991,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          this.safeShutdown(flag, false);
      }
      public void safeShutdown(boolean flag, boolean isRestarting) {
@@ -29,10 +29,10 @@ index aacc1b82ed178d6c0e499a53ce1aec7e20dad875..ee75fe091f7fd28426b9af329358ea0d
          this.isRestarting = isRestarting;
          this.hasLoggedStop = true; // Paper
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 69888acd1932fd896245e77ce58b53b8cdaf202c..de917e53fdbd4d8965237864db5fe8bf63cca61b 100644
+index f9a9bf683bad6957fe1e7987b83c0278ba5379f8..ee257bdbded60f6e119ce3349f75a7603ff49e8d 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -340,6 +340,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -339,6 +339,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
                  MinecraftServerBeans.a((MinecraftServer) this);
              }
  
@@ -42,10 +42,10 @@ index 69888acd1932fd896245e77ce58b53b8cdaf202c..de917e53fdbd4d8965237864db5fe8bf
          }
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 62f2033606170248f07f7683688b8a11ca3bd302..1f6a84566e8bd2df866fd4c166a0e1874bb1e4bb 100644
+index 9a41d4ae2a64ba542dd9b6b98b01dd660a43b2dc..659c178684464787c73471ad960d5b37f9dbe2ec 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -598,6 +598,8 @@ public abstract class PlayerList {
+@@ -597,6 +597,8 @@ public abstract class PlayerList {
          if (entityplayer.didPlayerJoinEvent) cserver.getPluginManager().callEvent(playerQuitEvent); // Paper - if we disconnected before join ever fired, don't fire quit
          entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
  
diff --git a/patches/server-unmapped/0153-Striders-give-saddle-back.patch b/patches/server-unmapped/0151-Striders-give-saddle-back.patch
similarity index 100%
rename from patches/server-unmapped/0153-Striders-give-saddle-back.patch
rename to patches/server-unmapped/0151-Striders-give-saddle-back.patch
diff --git a/patches/server-unmapped/0154-PlayerBookTooLargeEvent.patch b/patches/server-unmapped/0152-PlayerBookTooLargeEvent.patch
similarity index 90%
rename from patches/server-unmapped/0154-PlayerBookTooLargeEvent.patch
rename to patches/server-unmapped/0152-PlayerBookTooLargeEvent.patch
index 8fc37c1e2..23328a408 100644
--- a/patches/server-unmapped/0154-PlayerBookTooLargeEvent.patch
+++ b/patches/server-unmapped/0152-PlayerBookTooLargeEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] PlayerBookTooLargeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 764ec67150a37f3a18eb1efde9d0c8810a92da6d..04052a43a2025876529d2a6c6f5fc9821c723da6 100644
+index dc830f1e23b6eb81d47e111e3f4d8d19010b4c9f..797e067a08395af491ffdb64d01eed6535ffd1f7 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-@@ -1136,6 +1136,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1092,6 +1092,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
              NBTTagList pageList = testStack.getTag().getList("pages", 8);
              if (pageList.size() > 100) {
                  PlayerConnection.LOGGER.warn(this.player.getName() + " tried to send a book with too many pages");
@@ -16,7 +16,7 @@ index 764ec67150a37f3a18eb1efde9d0c8810a92da6d..04052a43a2025876529d2a6c6f5fc982
                  minecraftServer.scheduleOnMain(() -> this.disconnect("Book too large!", org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION)); // Paper - kick event cause
                  return;
              }
-@@ -1148,6 +1149,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1104,6 +1105,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  int byteLength = testString.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
                  if (byteLength > 256 * 4) {
                      PlayerConnection.LOGGER.warn(this.player.getName() + " tried to send a book with with a page too large!");
@@ -24,7 +24,7 @@ index 764ec67150a37f3a18eb1efde9d0c8810a92da6d..04052a43a2025876529d2a6c6f5fc982
                      minecraftServer.scheduleOnMain(() -> this.disconnect("Book too large!", org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION)); // Paper - kick event cause
                      return;
                  }
-@@ -1171,6 +1173,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1127,6 +1129,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
              if (byteTotal > byteAllowed) {
                  PlayerConnection.LOGGER.warn(this.player.getName() + " tried to send too large of a book. Book Size: " + byteTotal + " - Allowed:  "+ byteAllowed + " - Pages: " + pageList.size());
diff --git a/patches/server-unmapped/0155-Full-netherite-armor-grants-fire-resistance.patch b/patches/server-unmapped/0153-Full-netherite-armor-grants-fire-resistance.patch
similarity index 97%
rename from patches/server-unmapped/0155-Full-netherite-armor-grants-fire-resistance.patch
rename to patches/server-unmapped/0153-Full-netherite-armor-grants-fire-resistance.patch
index 07615da77..470b13c6e 100644
--- a/patches/server-unmapped/0155-Full-netherite-armor-grants-fire-resistance.patch
+++ b/patches/server-unmapped/0153-Full-netherite-armor-grants-fire-resistance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Full netherite armor grants fire resistance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
-index c2a35fac1065b2b67a0a3ce94432246892f6f4a5..5f4a9ef27ab1a177a048fbf376d1e353be865e6f 100644
+index 4bb40046f1f21bdfeaf10961001e90b1724e00bb..f28553724fa575f62a67f98891b35a896bb4c3b0 100644
 --- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
 +++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
 @@ -339,6 +339,16 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/patches/server-unmapped/0156-Fix-rotating-UP-DOWN-CW-and-CCW.patch b/patches/server-unmapped/0154-Fix-rotating-UP-DOWN-CW-and-CCW.patch
similarity index 93%
rename from patches/server-unmapped/0156-Fix-rotating-UP-DOWN-CW-and-CCW.patch
rename to patches/server-unmapped/0154-Fix-rotating-UP-DOWN-CW-and-CCW.patch
index 187d93067..e4f7831b1 100644
--- a/patches/server-unmapped/0156-Fix-rotating-UP-DOWN-CW-and-CCW.patch
+++ b/patches/server-unmapped/0154-Fix-rotating-UP-DOWN-CW-and-CCW.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix rotating UP/DOWN CW and CCW
 
 
 diff --git a/src/main/java/net/minecraft/core/EnumDirection.java b/src/main/java/net/minecraft/core/EnumDirection.java
-index 29d747f7fc5824a222755ebf96dfe053896d43d0..9f1ea11d0bc15b8b0069fcf46ea2f6751c5e3064 100644
+index 1a765ece1ad6d691c509a018469aa9ecf4f2f8f3..7dbd6619d50492ca7df4df5a2ee3d408abb229a4 100644
 --- a/src/main/java/net/minecraft/core/EnumDirection.java
 +++ b/src/main/java/net/minecraft/core/EnumDirection.java
 @@ -127,6 +127,12 @@ public enum EnumDirection implements INamable {
diff --git a/patches/server-unmapped/0157-Add-MC-4-fix-back.patch b/patches/server-unmapped/0155-Add-MC-4-fix-back.patch
similarity index 85%
rename from patches/server-unmapped/0157-Add-MC-4-fix-back.patch
rename to patches/server-unmapped/0155-Add-MC-4-fix-back.patch
index 1c54d4616..67b8cacf8 100644
--- a/patches/server-unmapped/0157-Add-MC-4-fix-back.patch
+++ b/patches/server-unmapped/0155-Add-MC-4-fix-back.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Add MC-4 fix back
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/EntityItem.java b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
-index be46b8fcbfed932ba96a34c94eee0b237c783bd4..dd4997e7ffac4773e01add88efec7c0dcd7b4df0 100644
+index cd711fa6f4d8e98fbfa9e3956d9fb1d36e6bb2d9..dd4997e7ffac4773e01add88efec7c0dcd7b4df0 100644
 --- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java
 +++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
 @@ -583,7 +583,7 @@ public class EntityItem extends Entity {
  
      // Paper start - fix MC-4
      public void setPositionRaw(double x, double y, double z) {
--        if (false && com.destroystokyo.paper.PaperConfig.fixEntityPositionDesync) { // Tuinity - revert
+-        if (com.destroystokyo.paper.PaperConfig.fixEntityPositionDesync) {
 +        if (com.destroystokyo.paper.PaperConfig.fixEntityPositionDesync) { // Tuinity - revert // Purpur - no
              // encode/decode from PacketPlayOutEntity
              x = MathHelper.floorLong(x * 4096.0D) * (1 / 4096.0D);
diff --git a/patches/server-unmapped/0158-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server-unmapped/0156-Add-mobGriefing-bypass-to-everything-affected.patch
similarity index 99%
rename from patches/server-unmapped/0158-Add-mobGriefing-bypass-to-everything-affected.patch
rename to patches/server-unmapped/0156-Add-mobGriefing-bypass-to-everything-affected.patch
index ff070a973..abdcb5073 100644
--- a/patches/server-unmapped/0158-Add-mobGriefing-bypass-to-everything-affected.patch
+++ b/patches/server-unmapped/0156-Add-mobGriefing-bypass-to-everything-affected.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
 This adds the "bypass-mob-griefing" world config option to everything that is affected by the gamerule.
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 3b76a652a3888d7d0b7dfb13f9ebbf0732e71d71..0e46f6b4fedc0e0d65737a3553ab8cd8dbf68e7d 100644
+index 65cafb25252aa1d2013311a8fef364b96ee7273c..d5c4c183db2dc01d65a9d39727722b8251872a6f 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -1568,7 +1568,7 @@ public abstract class EntityLiving extends Entity {
@@ -115,7 +115,7 @@ index 3934966b06eb9880ed316cee84d099edd80c09b9..b13cd3f344a0e2c4c02b30f80ca9a81d
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
-index aeff46b575a05145fb509b5e5a489b2067776e2f..0614483830336f3bbd348319ca3eed8767568852 100644
+index 1ac5ce2687aae103e7811fd3bacdf1cbc048c59f..ebf682c8ea6eb5feb499815a1dc1bea5715038c7 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
 @@ -539,7 +539,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -128,7 +128,7 @@ index aeff46b575a05145fb509b5e5a489b2067776e2f..0614483830336f3bbd348319ca3eed87
                              // flag1 = this.world.a(blockposition, false) || flag1;
                              flag1 = true;
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java b/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
-index 528161748472b0fb84718268800864e94ceaa079..fea99134e77d7cbc77c89318753e7294d3f6a15a 100644
+index 0c631868c7e7bade389e907e5657d76172590cac..5ca2833adc383845c2ea1824a130f17445498f19 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
 @@ -378,7 +378,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -312,7 +312,7 @@ index 32d71b6fc3fd0300386fb80e6d12d5f7c2361efe..55ad7693ced8bab5bc8b36a375c85370
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/BlockSoil.java b/src/main/java/net/minecraft/world/level/block/BlockSoil.java
-index f00eb3cda60f6f8b2534c3da5ffaa6faee334663..386641173bb758c1ba1e80071f68813fec012a93 100644
+index 3e8893bf76b8ffda4c595c81086556ea929beaa4..d3fd0b418b9088b621e44f5da452db74b433efe8 100644
 --- a/src/main/java/net/minecraft/world/level/block/BlockSoil.java
 +++ b/src/main/java/net/minecraft/world/level/block/BlockSoil.java
 @@ -99,7 +99,7 @@ public class BlockSoil extends Block {
diff --git a/patches/server-unmapped/0159-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server-unmapped/0157-Config-to-allow-Note-Block-sounds-when-blocked.patch
similarity index 100%
rename from patches/server-unmapped/0159-Config-to-allow-Note-Block-sounds-when-blocked.patch
rename to patches/server-unmapped/0157-Config-to-allow-Note-Block-sounds-when-blocked.patch
diff --git a/patches/server-unmapped/0160-Add-EntityTeleportHinderedEvent.patch b/patches/server-unmapped/0158-Add-EntityTeleportHinderedEvent.patch
similarity index 96%
rename from patches/server-unmapped/0160-Add-EntityTeleportHinderedEvent.patch
rename to patches/server-unmapped/0158-Add-EntityTeleportHinderedEvent.patch
index 40d7ad234..c415de1ad 100644
--- a/patches/server-unmapped/0160-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server-unmapped/0158-Add-EntityTeleportHinderedEvent.patch
@@ -82,7 +82,7 @@ index d918194e45953764fa3fd286b715714330a60941..70496562faa89e92da34a4f7b891f845
              if (this.exitPortal == null && this.world.getTypeKey() == DimensionManager.THE_END) { // CraftBukkit - work in alternate worlds
                  this.a((WorldServer) this.world);
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBase.java b/src/main/java/net/minecraft/world/level/block/state/BlockBase.java
-index df595dc52858807479584ce8da49390a25695990..0990eb8b2e2d8a5f7c1a2640727d86c37a50298e 100644
+index e0a6e2b975889a784c239fab18e70403dec937bc..3ca3983728d607c4222a76e7f7a97341577c5284 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBase.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBase.java
 @@ -303,6 +303,7 @@ public abstract class BlockBase {
@@ -108,10 +108,10 @@ index a0df754d98e4be46720ba0962bdf7bf62f3425bb..c8b510a49ba5c299ec38ea1a56f5245e
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index dcdc82b42689b4962323938a62cf7ded49afd6f4..4a70d657fd83627e8d66b52cb5f87381b43ad76a 100644
+index 701063a90492131a51007a9f70dbb72e31d016b7..d567297364920660a6ef9c9198b29382e73342df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -550,6 +550,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -541,6 +541,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          location.checkFinite();
  
          if (entity.isVehicle() || entity.dead) {
@@ -123,7 +123,7 @@ index dcdc82b42689b4962323938a62cf7ded49afd6f4..4a70d657fd83627e8d66b52cb5f87381
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8cc2b2b83ad3cb74f8cf7916141ae1f4ade27908..0501d5bee249ac35e6344dfa1bed3d802901f377 100644
+index 175dfb418f910d6486109073d0a406461a48f7ec..ecc655ae9414ceb08a92db6fce2e339ee10ea27b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -126,6 +126,7 @@ import org.bukkit.entity.EntityType;
diff --git a/patches/server-unmapped/0161-Add-StructureGenerateEvent.patch b/patches/server-unmapped/0159-Add-StructureGenerateEvent.patch
similarity index 97%
rename from patches/server-unmapped/0161-Add-StructureGenerateEvent.patch
rename to patches/server-unmapped/0159-Add-StructureGenerateEvent.patch
index f2aa81f63..b6f744a3b 100644
--- a/patches/server-unmapped/0161-Add-StructureGenerateEvent.patch
+++ b/patches/server-unmapped/0159-Add-StructureGenerateEvent.patch
@@ -19,7 +19,7 @@ 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 316287af6e405ff224636255c2964f46003215ce..ff98335155c86803b98d8c67f0b40b8d65214890 100644
+index f2621f61cb372ec436fe81e7a93f1aef7d360f3f..3810f75b7a5404f394cbefcc4ca1210c5bc9c504 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -287,6 +287,14 @@ public abstract class ChunkGenerator {
diff --git a/patches/server-unmapped/0162-Farmland-trampling-changes.patch b/patches/server-unmapped/0160-Farmland-trampling-changes.patch
similarity index 97%
rename from patches/server-unmapped/0162-Farmland-trampling-changes.patch
rename to patches/server-unmapped/0160-Farmland-trampling-changes.patch
index 65b20f5f0..b5727a7c3 100644
--- a/patches/server-unmapped/0162-Farmland-trampling-changes.patch
+++ b/patches/server-unmapped/0160-Farmland-trampling-changes.patch
@@ -12,7 +12,7 @@ necessary to trample in the first place. Feather Falling 1 requires
 you to fall over 3+ blocks to trample. FF 2 requires 4+, etc.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BlockSoil.java b/src/main/java/net/minecraft/world/level/block/BlockSoil.java
-index 386641173bb758c1ba1e80071f68813fec012a93..0c7422d9b041341b12f1b8796236b8728b93ff2f 100644
+index d3fd0b418b9088b621e44f5da452db74b433efe8..e7e5ee52cb7ac7e406c837db686d0a96dcc13fbc 100644
 --- a/src/main/java/net/minecraft/world/level/block/BlockSoil.java
 +++ b/src/main/java/net/minecraft/world/level/block/BlockSoil.java
 @@ -4,13 +4,17 @@ import java.util.Iterator;
diff --git a/patches/server-unmapped/0163-Movement-options-for-armor-stands.patch b/patches/server-unmapped/0161-Movement-options-for-armor-stands.patch
similarity index 97%
rename from patches/server-unmapped/0163-Movement-options-for-armor-stands.patch
rename to patches/server-unmapped/0161-Movement-options-for-armor-stands.patch
index 8e9302cb6..d470fc151 100644
--- a/patches/server-unmapped/0163-Movement-options-for-armor-stands.patch
+++ b/patches/server-unmapped/0161-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 ca5afdcc9c5ae7b5f67a2c12f62e89ef5e227e3c..6c5c950b129b5e7e7d0d614cfdbfb5c59fda86de 100644
+index 4c427a3950b1418ef6135a288449f5b7f7939701..da5f4402970900f727403e4f0437256f3e84b7fe 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1496,7 +1496,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -1252,7 +1252,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return this.isInWater() || flag;
      }
  
diff --git a/patches/server-unmapped/0164-Fix-stuck-in-portals.patch b/patches/server-unmapped/0162-Fix-stuck-in-portals.patch
similarity index 89%
rename from patches/server-unmapped/0164-Fix-stuck-in-portals.patch
rename to patches/server-unmapped/0162-Fix-stuck-in-portals.patch
index d790d2323..dac7f5367 100644
--- a/patches/server-unmapped/0164-Fix-stuck-in-portals.patch
+++ b/patches/server-unmapped/0162-Fix-stuck-in-portals.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix stuck in portals
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index c631e4d27518a1382869c184af41bec911cce908..2bae88b7b53d38f41808fe0177cd78a9e2bb1ce9 100644
+index 574486804ae64fa870de5499f6955ed13357d616..6abc6cfa4e6fd4de03752526269db162503bf7b9 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -1300,6 +1300,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1121,6 +1121,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                  playerlist.d(this);
                  worldserver1.removePlayer(this);
                  this.dead = false;
@@ -17,10 +17,10 @@ index c631e4d27518a1382869c184af41bec911cce908..2bae88b7b53d38f41808fe0177cd78a9
                  // CraftBukkit end
                  this.spawnIn(worldserver);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6c5c950b129b5e7e7d0d614cfdbfb5c59fda86de..27cd04a4b6e0c87a300f5868f0b82fc02408a556 100644
+index da5f4402970900f727403e4f0437256f3e84b7fe..d56ee8483fa1011f303a0afac5130279b6f9a191 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2552,12 +2552,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2305,12 +2305,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return new Vec2F(this.pitch, this.yaw);
      }
  
diff --git a/patches/server-unmapped/0165-Config-to-use-infinity-bows-without-arrows.patch b/patches/server-unmapped/0163-Config-to-use-infinity-bows-without-arrows.patch
similarity index 100%
rename from patches/server-unmapped/0165-Config-to-use-infinity-bows-without-arrows.patch
rename to patches/server-unmapped/0163-Config-to-use-infinity-bows-without-arrows.patch
diff --git a/patches/server-unmapped/0166-Toggle-for-water-sensitive-mob-damage.patch b/patches/server-unmapped/0164-Toggle-for-water-sensitive-mob-damage.patch
similarity index 96%
rename from patches/server-unmapped/0166-Toggle-for-water-sensitive-mob-damage.patch
rename to patches/server-unmapped/0164-Toggle-for-water-sensitive-mob-damage.patch
index bc6f4af8c..983ef806f 100644
--- a/patches/server-unmapped/0166-Toggle-for-water-sensitive-mob-damage.patch
+++ b/patches/server-unmapped/0164-Toggle-for-water-sensitive-mob-damage.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Toggle for water sensitive mob damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-index 8c74adf071e1edb640b3f2375bc92567cc2f6086..7cacd2b56fa96411d9fdf96d985d24fe835f9a91 100644
+index 9f6c98a8649b31ef8f5f2e60b1cb2f9f62f70930..41af652c8ba15753dcae3cf6a96df188d5f34886 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-@@ -854,7 +854,8 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -848,7 +848,8 @@ public abstract class EntityInsentient extends EntityLiving {
                  if (goalFloat.validConditions()) goalFloat.update();
                  this.getControllerJump().jumpIfSet();
              }
@@ -19,7 +19,7 @@ index 8c74adf071e1edb640b3f2375bc92567cc2f6086..7cacd2b56fa96411d9fdf96d985d24fe
              }
              return;
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 0e46f6b4fedc0e0d65737a3553ab8cd8dbf68e7d..9b5c42406585ed72a19c52c23f3c8b4c8f15808d 100644
+index d5c4c183db2dc01d65a9d39727722b8251872a6f..a2afce8391a8bd30e39cda917d92842fe3da33e5 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -2974,6 +2974,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server-unmapped/0167-Config-to-always-tame-in-Creative.patch b/patches/server-unmapped/0165-Config-to-always-tame-in-Creative.patch
similarity index 98%
rename from patches/server-unmapped/0167-Config-to-always-tame-in-Creative.patch
rename to patches/server-unmapped/0165-Config-to-always-tame-in-Creative.patch
index 97db59cb9..19ca2eb53 100644
--- a/patches/server-unmapped/0167-Config-to-always-tame-in-Creative.patch
+++ b/patches/server-unmapped/0165-Config-to-always-tame-in-Creative.patch
@@ -20,7 +20,7 @@ index d285f5aa66fa81a2f56920c05afb4506cb82fa54..39e348847bcecd91013452e71ef16729
                      return;
                  }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/EntityCat.java b/src/main/java/net/minecraft/world/entity/animal/EntityCat.java
-index a4e3e36f081803b0588a0e907a3a834b7a3ab3eb..84784e91eb6c4bee7e66a6dee8736b948414a7a5 100644
+index b3b26044daaf084b9bdc911f10804bbb852f088c..048cd00d7a06d572e39fe8bd020c097b203d0253 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/EntityCat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/EntityCat.java
 @@ -439,7 +439,7 @@ public class EntityCat extends EntityTameableAnimal {
diff --git a/patches/server-unmapped/0168-End-crystal-explosion-options.patch b/patches/server-unmapped/0166-End-crystal-explosion-options.patch
similarity index 100%
rename from patches/server-unmapped/0168-End-crystal-explosion-options.patch
rename to patches/server-unmapped/0166-End-crystal-explosion-options.patch
diff --git a/patches/server-unmapped/0169-Add-unsafe-Entity-serialization-API.patch b/patches/server-unmapped/0167-Add-unsafe-Entity-serialization-API.patch
similarity index 97%
rename from patches/server-unmapped/0169-Add-unsafe-Entity-serialization-API.patch
rename to patches/server-unmapped/0167-Add-unsafe-Entity-serialization-API.patch
index 9e1a36463..9bad1fac2 100644
--- a/patches/server-unmapped/0169-Add-unsafe-Entity-serialization-API.patch
+++ b/patches/server-unmapped/0167-Add-unsafe-Entity-serialization-API.patch
@@ -29,10 +29,10 @@ index 2cf4e8f68fa85c4e09effda0da0c3a3f64ae7ba9..c166e0a8e7eadb4f714078f764ef35f7
          return SystemUtils.a(a(nbttagcompound).map((entitytypes) -> {
              return entitytypes.a(world);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 4a70d657fd83627e8d66b52cb5f87381b43ad76a..af69023b241560031f6aa116561d7407b2502578 100644
+index d567297364920660a6ef9c9198b29382e73342df..b1bb47992451b5e76d1cbe5b2bee550af583f818 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1196,5 +1196,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1187,5 +1187,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean isRidableInWater() {
          return getHandle().isRidableInWater();
      }
diff --git a/patches/server-unmapped/0170-Add-ghast-allow-griefing-option.patch b/patches/server-unmapped/0168-Add-ghast-allow-griefing-option.patch
similarity index 100%
rename from patches/server-unmapped/0170-Add-ghast-allow-griefing-option.patch
rename to patches/server-unmapped/0168-Add-ghast-allow-griefing-option.patch
diff --git a/patches/server-unmapped/0171-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server-unmapped/0169-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
similarity index 91%
rename from patches/server-unmapped/0171-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
rename to patches/server-unmapped/0169-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
index f65fab7a3..864613f32 100644
--- a/patches/server-unmapped/0171-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
+++ b/patches/server-unmapped/0169-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configs for if Wither/Ender Dragon can ride vehicles
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 27cd04a4b6e0c87a300f5868f0b82fc02408a556..11924a84fd597da38e70aa0ab29c07e60ed8453a 100644
+index d56ee8483fa1011f303a0afac5130279b6f9a191..7b28e61eee6f65219a11e63dea3728aa36b9a313 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2402,7 +2402,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2155,7 +2155,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          }
      }
  
@@ -18,7 +18,7 @@ index 27cd04a4b6e0c87a300f5868f0b82fc02408a556..11924a84fd597da38e70aa0ab29c07e6
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
-index 0614483830336f3bbd348319ca3eed8767568852..d27f61959e924e1ce6c7d76c905d98a762823e91 100644
+index ebf682c8ea6eb5feb499815a1dc1bea5715038c7..0ce49a3095472383dbe9362ece186a7bd60939b6 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
 @@ -1073,6 +1073,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -30,7 +30,7 @@ index 0614483830336f3bbd348319ca3eed8767568852..d27f61959e924e1ce6c7d76c905d98a7
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java b/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
-index fea99134e77d7cbc77c89318753e7294d3f6a15a..1a764ba0a7402ce71038635f48d4b578457cc255 100644
+index 5ca2833adc383845c2ea1824a130f17445498f19..9e1b4fb9b9a111e8da7b4b0db9ebee0099705bf2 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
 @@ -728,6 +728,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
diff --git a/patches/server-unmapped/0172-Dont-run-with-scissors.patch b/patches/server-unmapped/0170-Dont-run-with-scissors.patch
similarity index 94%
rename from patches/server-unmapped/0172-Dont-run-with-scissors.patch
rename to patches/server-unmapped/0170-Dont-run-with-scissors.patch
index 3a0afcc03..f6522cb3c 100644
--- a/patches/server-unmapped/0172-Dont-run-with-scissors.patch
+++ b/patches/server-unmapped/0170-Dont-run-with-scissors.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Dont run with scissors!
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 04052a43a2025876529d2a6c6f5fc9821c723da6..d1b708da030326cf22b678df8151536fc13afe00 100644
+index 797e067a08395af491ffdb64d01eed6535ffd1f7..38e88a99c41eaeb172068357b8f0dabe9d7ef27e 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-@@ -1560,6 +1560,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1498,6 +1498,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
                                      this.player.fallDistance = 0.0F;
                                  }
  
diff --git a/patches/server-unmapped/0173-One-Punch-Man.patch b/patches/server-unmapped/0171-One-Punch-Man.patch
similarity index 97%
rename from patches/server-unmapped/0173-One-Punch-Man.patch
rename to patches/server-unmapped/0171-One-Punch-Man.patch
index 512592c99..1955bb8ee 100644
--- a/patches/server-unmapped/0173-One-Punch-Man.patch
+++ b/patches/server-unmapped/0171-One-Punch-Man.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] One Punch Man!
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 9b5c42406585ed72a19c52c23f3c8b4c8f15808d..7af455e5472dc2b6ed177494a9da86c59c6ede5f 100644
+index a2afce8391a8bd30e39cda917d92842fe3da33e5..11390c5eba03ca2d60c2f711807970078c5704ea 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -2016,6 +2016,23 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server-unmapped/0174-Add-config-for-snow-on-blue-ice.patch b/patches/server-unmapped/0172-Add-config-for-snow-on-blue-ice.patch
similarity index 100%
rename from patches/server-unmapped/0174-Add-config-for-snow-on-blue-ice.patch
rename to patches/server-unmapped/0172-Add-config-for-snow-on-blue-ice.patch
diff --git a/patches/server-unmapped/0175-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server-unmapped/0173-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
similarity index 100%
rename from patches/server-unmapped/0175-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
rename to patches/server-unmapped/0173-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
diff --git a/patches/server-unmapped/0176-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server-unmapped/0174-Config-to-ignore-nearby-mobs-when-sleeping.patch
similarity index 93%
rename from patches/server-unmapped/0176-Config-to-ignore-nearby-mobs-when-sleeping.patch
rename to patches/server-unmapped/0174-Config-to-ignore-nearby-mobs-when-sleeping.patch
index 3bfd2883b..cf99e7e20 100644
--- a/patches/server-unmapped/0176-Config-to-ignore-nearby-mobs-when-sleeping.patch
+++ b/patches/server-unmapped/0174-Config-to-ignore-nearby-mobs-when-sleeping.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 2bae88b7b53d38f41808fe0177cd78a9e2bb1ce9..b8f9678ac9207e099a485c7d5c98f5766f32bd29 100644
+index 6abc6cfa4e6fd4de03752526269db162503bf7b9..8b957fe6c88ae4eded4a89846cae2df4456c04bf 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -1464,7 +1464,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1285,7 +1285,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                              return entitymonster.f((EntityHuman) this);
                          });
  
diff --git a/patches/server-unmapped/0177-Config-for-Enderman-to-aggro-spawned-Endermites.patch b/patches/server-unmapped/0175-Config-for-Enderman-to-aggro-spawned-Endermites.patch
similarity index 100%
rename from patches/server-unmapped/0177-Config-for-Enderman-to-aggro-spawned-Endermites.patch
rename to patches/server-unmapped/0175-Config-for-Enderman-to-aggro-spawned-Endermites.patch
diff --git a/patches/server-unmapped/0178-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server-unmapped/0176-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
similarity index 100%
rename from patches/server-unmapped/0178-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
rename to patches/server-unmapped/0176-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
diff --git a/patches/server-unmapped/0179-Tick-fluids-config.patch b/patches/server-unmapped/0177-Tick-fluids-config.patch
similarity index 100%
rename from patches/server-unmapped/0179-Tick-fluids-config.patch
rename to patches/server-unmapped/0177-Tick-fluids-config.patch
diff --git a/patches/server-unmapped/0180-Config-to-disable-Llama-caravans.patch b/patches/server-unmapped/0178-Config-to-disable-Llama-caravans.patch
similarity index 100%
rename from patches/server-unmapped/0180-Config-to-disable-Llama-caravans.patch
rename to patches/server-unmapped/0178-Config-to-disable-Llama-caravans.patch
diff --git a/patches/server-unmapped/0181-Config-to-make-Creepers-explode-on-death.patch b/patches/server-unmapped/0179-Config-to-make-Creepers-explode-on-death.patch
similarity index 100%
rename from patches/server-unmapped/0181-Config-to-make-Creepers-explode-on-death.patch
rename to patches/server-unmapped/0179-Config-to-make-Creepers-explode-on-death.patch
diff --git a/patches/server-unmapped/0182-Configurable-ravager-griefable-blocks-list.patch b/patches/server-unmapped/0180-Configurable-ravager-griefable-blocks-list.patch
similarity index 100%
rename from patches/server-unmapped/0182-Configurable-ravager-griefable-blocks-list.patch
rename to patches/server-unmapped/0180-Configurable-ravager-griefable-blocks-list.patch
diff --git a/patches/server-unmapped/0183-Sneak-to-bulk-process-composter.patch b/patches/server-unmapped/0181-Sneak-to-bulk-process-composter.patch
similarity index 100%
rename from patches/server-unmapped/0183-Sneak-to-bulk-process-composter.patch
rename to patches/server-unmapped/0181-Sneak-to-bulk-process-composter.patch
diff --git a/patches/server-unmapped/0184-Config-for-skipping-night.patch b/patches/server-unmapped/0182-Config-for-skipping-night.patch
similarity index 92%
rename from patches/server-unmapped/0184-Config-for-skipping-night.patch
rename to patches/server-unmapped/0182-Config-for-skipping-night.patch
index 9f41efd97..3c915af1b 100644
--- a/patches/server-unmapped/0184-Config-for-skipping-night.patch
+++ b/patches/server-unmapped/0182-Config-for-skipping-night.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config for skipping night
 
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index ab0e16b8f659ff86f022fef210b97dfa59206b0c..7d0c5d28597c51d332146a82df06ba519711f836 100644
+index 9276500e4cc2a0d2d374b3f1393410e8295b3b4d..b69e5931c7fe0cc5daf768139e78f4b477180fde 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
-@@ -1028,7 +1028,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -572,7 +572,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
          }
          // CraftBukkit end
  
diff --git a/patches/server-unmapped/0185-Add-config-for-villager-trading.patch b/patches/server-unmapped/0183-Add-config-for-villager-trading.patch
similarity index 100%
rename from patches/server-unmapped/0185-Add-config-for-villager-trading.patch
rename to patches/server-unmapped/0183-Add-config-for-villager-trading.patch
diff --git a/patches/server-unmapped/0186-Allow-infinity-on-crossbows.patch b/patches/server-unmapped/0184-Allow-infinity-on-crossbows.patch
similarity index 100%
rename from patches/server-unmapped/0186-Allow-infinity-on-crossbows.patch
rename to patches/server-unmapped/0184-Allow-infinity-on-crossbows.patch
diff --git a/patches/server-unmapped/0187-Drowning-Settings.patch b/patches/server-unmapped/0185-Drowning-Settings.patch
similarity index 92%
rename from patches/server-unmapped/0187-Drowning-Settings.patch
rename to patches/server-unmapped/0185-Drowning-Settings.patch
index c3232fa2d..2ef66e8d3 100644
--- a/patches/server-unmapped/0187-Drowning-Settings.patch
+++ b/patches/server-unmapped/0185-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 11924a84fd597da38e70aa0ab29c07e60ed8453a..778c5ee222d51e35bac51bba42f336780fd153dc 100644
+index 7b28e61eee6f65219a11e63dea3728aa36b9a313..72d5e5f728645898675b86654ec92df923cf457e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2608,7 +2608,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2361,7 +2361,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
      }
  
      public int getDefaultPortalCooldown() {
@@ -18,7 +18,7 @@ index 11924a84fd597da38e70aa0ab29c07e60ed8453a..778c5ee222d51e35bac51bba42f33678
  
      public Iterable<ItemStack> bn() {
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 7af455e5472dc2b6ed177494a9da86c59c6ede5f..379782d5dcb212419c8df2a9a534749b3bd63f21 100644
+index 11390c5eba03ca2d60c2f711807970078c5704ea..89ae9836b0712ae78a8dfefe688d95d53b1156e2 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -393,7 +393,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server-unmapped/0188-Break-individual-slabs-when-sneaking.patch b/patches/server-unmapped/0186-Break-individual-slabs-when-sneaking.patch
similarity index 96%
rename from patches/server-unmapped/0188-Break-individual-slabs-when-sneaking.patch
rename to patches/server-unmapped/0186-Break-individual-slabs-when-sneaking.patch
index 989dfd74b..8891a1e62 100644
--- a/patches/server-unmapped/0188-Break-individual-slabs-when-sneaking.patch
+++ b/patches/server-unmapped/0186-Break-individual-slabs-when-sneaking.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Break individual slabs when sneaking
 
 
 diff --git a/src/main/java/net/minecraft/server/level/PlayerInteractManager.java b/src/main/java/net/minecraft/server/level/PlayerInteractManager.java
-index 1746a8c1750b494c47f9f46e83b248d8129d2630..7302554063ac7b5dedaff895cba33b70234008e6 100644
+index 87722285690d9d3370610e2a2eb809e0d1f497c9..e80d80b230cde5ca9278691313f556147229013b 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerInteractManager.java
-@@ -410,6 +410,8 @@ public class PlayerInteractManager {
+@@ -377,6 +377,8 @@ public class PlayerInteractManager {
                  }
                  return false;
              }
diff --git a/patches/server-unmapped/0189-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server-unmapped/0187-Config-to-disable-hostile-mob-spawn-on-ice.patch
similarity index 100%
rename from patches/server-unmapped/0189-Config-to-disable-hostile-mob-spawn-on-ice.patch
rename to patches/server-unmapped/0187-Config-to-disable-hostile-mob-spawn-on-ice.patch
diff --git a/patches/server-unmapped/0190-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server-unmapped/0188-Config-to-show-Armor-Stand-arms-on-spawn.patch
similarity index 100%
rename from patches/server-unmapped/0190-Config-to-show-Armor-Stand-arms-on-spawn.patch
rename to patches/server-unmapped/0188-Config-to-show-Armor-Stand-arms-on-spawn.patch
diff --git a/patches/server-unmapped/0191-Option-to-make-doors-require-redstone.patch b/patches/server-unmapped/0189-Option-to-make-doors-require-redstone.patch
similarity index 100%
rename from patches/server-unmapped/0191-Option-to-make-doors-require-redstone.patch
rename to patches/server-unmapped/0189-Option-to-make-doors-require-redstone.patch
diff --git a/patches/server-unmapped/0192-Config-to-allow-for-unsafe-enchants.patch b/patches/server-unmapped/0190-Config-to-allow-for-unsafe-enchants.patch
similarity index 100%
rename from patches/server-unmapped/0192-Config-to-allow-for-unsafe-enchants.patch
rename to patches/server-unmapped/0190-Config-to-allow-for-unsafe-enchants.patch
diff --git a/patches/server-unmapped/0193-Configurable-sponge-absorption.patch b/patches/server-unmapped/0191-Configurable-sponge-absorption.patch
similarity index 100%
rename from patches/server-unmapped/0193-Configurable-sponge-absorption.patch
rename to patches/server-unmapped/0191-Configurable-sponge-absorption.patch
diff --git a/patches/server-unmapped/0194-Projectile-offset-config.patch b/patches/server-unmapped/0192-Projectile-offset-config.patch
similarity index 100%
rename from patches/server-unmapped/0194-Projectile-offset-config.patch
rename to patches/server-unmapped/0192-Projectile-offset-config.patch
diff --git a/patches/server-unmapped/0195-Config-for-powered-rail-activation-distance.patch b/patches/server-unmapped/0193-Config-for-powered-rail-activation-distance.patch
similarity index 100%
rename from patches/server-unmapped/0195-Config-for-powered-rail-activation-distance.patch
rename to patches/server-unmapped/0193-Config-for-powered-rail-activation-distance.patch
diff --git a/patches/server-unmapped/0196-Piglin-portal-spawn-modifier.patch b/patches/server-unmapped/0194-Piglin-portal-spawn-modifier.patch
similarity index 100%
rename from patches/server-unmapped/0196-Piglin-portal-spawn-modifier.patch
rename to patches/server-unmapped/0194-Piglin-portal-spawn-modifier.patch
diff --git a/patches/server-unmapped/0197-Config-to-change-max-number-of-bees.patch b/patches/server-unmapped/0195-Config-to-change-max-number-of-bees.patch
similarity index 100%
rename from patches/server-unmapped/0197-Config-to-change-max-number-of-bees.patch
rename to patches/server-unmapped/0195-Config-to-change-max-number-of-bees.patch
diff --git a/patches/server-unmapped/0198-Configurable-damage-settings-for-magma-blocks.patch b/patches/server-unmapped/0196-Configurable-damage-settings-for-magma-blocks.patch
similarity index 96%
rename from patches/server-unmapped/0198-Configurable-damage-settings-for-magma-blocks.patch
rename to patches/server-unmapped/0196-Configurable-damage-settings-for-magma-blocks.patch
index 39e34dd6c..3bfe07040 100644
--- a/patches/server-unmapped/0198-Configurable-damage-settings-for-magma-blocks.patch
+++ b/patches/server-unmapped/0196-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 778c5ee222d51e35bac51bba42f336780fd153dc..dcb8cff2671947140f5853b1f6d75ecc03ef368f 100644
+index 72d5e5f728645898675b86654ec92df923cf457e..cccab56c26db13d36da61232bbe9733b1c4ae2e3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -890,7 +890,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -802,7 +802,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
              }
              // CraftBukkit end
  
diff --git a/patches/server-unmapped/0199-Config-for-wither-explosion-radius.patch b/patches/server-unmapped/0197-Config-for-wither-explosion-radius.patch
similarity index 100%
rename from patches/server-unmapped/0199-Config-for-wither-explosion-radius.patch
rename to patches/server-unmapped/0197-Config-for-wither-explosion-radius.patch
diff --git a/patches/server-unmapped/0200-Add-credits-command.patch b/patches/server-unmapped/0198-Add-credits-command.patch
similarity index 100%
rename from patches/server-unmapped/0200-Add-credits-command.patch
rename to patches/server-unmapped/0198-Add-credits-command.patch
diff --git a/patches/server-unmapped/0201-Gamemode-extra-permissions.patch b/patches/server-unmapped/0199-Gamemode-extra-permissions.patch
similarity index 100%
rename from patches/server-unmapped/0201-Gamemode-extra-permissions.patch
rename to patches/server-unmapped/0199-Gamemode-extra-permissions.patch
diff --git a/patches/server-unmapped/0202-Config-for-changing-the-blocks-that-turn-into-paths.patch b/patches/server-unmapped/0200-Config-for-changing-the-blocks-that-turn-into-paths.patch
similarity index 100%
rename from patches/server-unmapped/0202-Config-for-changing-the-blocks-that-turn-into-paths.patch
rename to patches/server-unmapped/0200-Config-for-changing-the-blocks-that-turn-into-paths.patch
diff --git a/patches/server-unmapped/0203-Allows-you-to-change-the-thrust-limit-of-a-piston-by.patch b/patches/server-unmapped/0201-Allows-you-to-change-the-thrust-limit-of-a-piston-by.patch
similarity index 100%
rename from patches/server-unmapped/0203-Allows-you-to-change-the-thrust-limit-of-a-piston-by.patch
rename to patches/server-unmapped/0201-Allows-you-to-change-the-thrust-limit-of-a-piston-by.patch
diff --git a/patches/server-unmapped/0204-Allows-change-broadcast-message-by-player.patch b/patches/server-unmapped/0202-Allows-change-broadcast-message-by-player.patch
similarity index 95%
rename from patches/server-unmapped/0204-Allows-change-broadcast-message-by-player.patch
rename to patches/server-unmapped/0202-Allows-change-broadcast-message-by-player.patch
index 9fe946a97..1495d2de0 100644
--- a/patches/server-unmapped/0204-Allows-change-broadcast-message-by-player.patch
+++ b/patches/server-unmapped/0202-Allows-change-broadcast-message-by-player.patch
@@ -33,10 +33,10 @@ index a1ee1066108985a95abddb03ff447b5a14f4f85f..4720644ae82f76f835f14c0b3a00e7b7
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index b8f9678ac9207e099a485c7d5c98f5766f32bd29..6d67eff4d584c287c97dfe32832c87bb59725bee 100644
+index 8b957fe6c88ae4eded4a89846cae2df4456c04bf..2b4d106ac59248dc2f7e73b4c549d807ff8ca628 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -1038,7 +1038,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -859,7 +859,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
              });
              ScoreboardTeamBase scoreboardteambase = this.getScoreboardTeam();
diff --git a/patches/server-unmapped/0205-Fix-SPIGOT-6278.patch b/patches/server-unmapped/0203-Fix-SPIGOT-6278.patch
similarity index 100%
rename from patches/server-unmapped/0205-Fix-SPIGOT-6278.patch
rename to patches/server-unmapped/0203-Fix-SPIGOT-6278.patch
diff --git a/patches/server-unmapped/0206-Implement-Mob-Blindness.patch b/patches/server-unmapped/0204-Implement-Mob-Blindness.patch
similarity index 96%
rename from patches/server-unmapped/0206-Implement-Mob-Blindness.patch
rename to patches/server-unmapped/0204-Implement-Mob-Blindness.patch
index 80fc7bb54..010e558c2 100644
--- a/patches/server-unmapped/0206-Implement-Mob-Blindness.patch
+++ b/patches/server-unmapped/0204-Implement-Mob-Blindness.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement Mob Blindness
 Ported from https://github.com/raltsmc/mobblindness
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 379782d5dcb212419c8df2a9a534749b3bd63f21..fa8df6ecede6ecb207e0e3390cc96c72d71a8a18 100644
+index 89ae9836b0712ae78a8dfefe688d95d53b1156e2..314516477a07ada0cc44f1d8826c9724be85e1a1 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -922,6 +922,18 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server-unmapped/0207-Hide-hidden-players-from-entity-selector.patch b/patches/server-unmapped/0205-Hide-hidden-players-from-entity-selector.patch
similarity index 100%
rename from patches/server-unmapped/0207-Hide-hidden-players-from-entity-selector.patch
rename to patches/server-unmapped/0205-Hide-hidden-players-from-entity-selector.patch
diff --git a/patches/server-unmapped/0208-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server-unmapped/0206-Config-for-health-to-impact-Creeper-explosion-radius.patch
similarity index 100%
rename from patches/server-unmapped/0208-Config-for-health-to-impact-Creeper-explosion-radius.patch
rename to patches/server-unmapped/0206-Config-for-health-to-impact-Creeper-explosion-radius.patch
diff --git a/patches/server-unmapped/0210-Iron-golem-poppy-calms-anger.patch b/patches/server-unmapped/0207-Iron-golem-poppy-calms-anger.patch
similarity index 100%
rename from patches/server-unmapped/0210-Iron-golem-poppy-calms-anger.patch
rename to patches/server-unmapped/0207-Iron-golem-poppy-calms-anger.patch
diff --git a/patches/server-unmapped/0211-Breedable-parrots.patch b/patches/server-unmapped/0208-Breedable-parrots.patch
similarity index 100%
rename from patches/server-unmapped/0211-Breedable-parrots.patch
rename to patches/server-unmapped/0208-Breedable-parrots.patch
diff --git a/patches/server-unmapped/0212-Configurable-powered-rail-boost-modifier.patch b/patches/server-unmapped/0209-Configurable-powered-rail-boost-modifier.patch
similarity index 100%
rename from patches/server-unmapped/0212-Configurable-powered-rail-boost-modifier.patch
rename to patches/server-unmapped/0209-Configurable-powered-rail-boost-modifier.patch
diff --git a/patches/server-unmapped/0213-Add-config-change-multiplier-critical-damage-value.patch b/patches/server-unmapped/0210-Add-config-change-multiplier-critical-damage-value.patch
similarity index 93%
rename from patches/server-unmapped/0213-Add-config-change-multiplier-critical-damage-value.patch
rename to patches/server-unmapped/0210-Add-config-change-multiplier-critical-damage-value.patch
index 62aa48e37..72893737d 100644
--- a/patches/server-unmapped/0213-Add-config-change-multiplier-critical-damage-value.patch
+++ b/patches/server-unmapped/0210-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/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
-index 5f4a9ef27ab1a177a048fbf376d1e353be865e6f..24285b1b2264939fdfa6f7d6311772fa67be8680 100644
+index f28553724fa575f62a67f98891b35a896bb4c3b0..934f097496d975c619300b20f3757fe75732184d 100644
 --- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
 +++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
-@@ -1188,7 +1188,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1182,7 +1182,7 @@ public abstract class EntityHuman extends EntityLiving {
                      flag2 = flag2 && !this.isSprinting();
                      if (flag2) {
                          this.isCritical = true; // Purpur
diff --git a/patches/server-unmapped/0214-Option-to-disable-dragon-egg-teleporting.patch b/patches/server-unmapped/0211-Option-to-disable-dragon-egg-teleporting.patch
similarity index 100%
rename from patches/server-unmapped/0214-Option-to-disable-dragon-egg-teleporting.patch
rename to patches/server-unmapped/0211-Option-to-disable-dragon-egg-teleporting.patch
diff --git a/patches/server-unmapped/0215-Config-for-unverified-username-message.patch b/patches/server-unmapped/0212-Config-for-unverified-username-message.patch
similarity index 96%
rename from patches/server-unmapped/0215-Config-for-unverified-username-message.patch
rename to patches/server-unmapped/0212-Config-for-unverified-username-message.patch
index 5d2d2f8d4..35d76a8e5 100644
--- a/patches/server-unmapped/0215-Config-for-unverified-username-message.patch
+++ b/patches/server-unmapped/0212-Config-for-unverified-username-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Config for unverified username message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/LoginListener.java b/src/main/java/net/minecraft/server/network/LoginListener.java
-index 25437a993c02379fa43e5d46159cd9ba2aebf10f..f378d654a7fdd61ca31ca50ba45eff6acd93c3f1 100644
+index 5b69126142140c7fc96435a4d246752581f47c33..f31a8a3cce627035875e833827c569743af46811 100644
 --- a/src/main/java/net/minecraft/server/network/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/network/LoginListener.java
 @@ -280,7 +280,7 @@ public class LoginListener implements PacketLoginInListener {
diff --git a/patches/server-unmapped/0216-Make-anvil-cumulative-cost-configurable.patch b/patches/server-unmapped/0213-Make-anvil-cumulative-cost-configurable.patch
similarity index 100%
rename from patches/server-unmapped/0216-Make-anvil-cumulative-cost-configurable.patch
rename to patches/server-unmapped/0213-Make-anvil-cumulative-cost-configurable.patch
diff --git a/patches/server-unmapped/0217-ShulkerBox-allow-oversized-stacks.patch b/patches/server-unmapped/0214-ShulkerBox-allow-oversized-stacks.patch
similarity index 95%
rename from patches/server-unmapped/0217-ShulkerBox-allow-oversized-stacks.patch
rename to patches/server-unmapped/0214-ShulkerBox-allow-oversized-stacks.patch
index 23b79c71d..78ee5622e 100644
--- a/patches/server-unmapped/0217-ShulkerBox-allow-oversized-stacks.patch
+++ b/patches/server-unmapped/0214-ShulkerBox-allow-oversized-stacks.patch
@@ -9,10 +9,10 @@ creating an itemstack using the TileEntity's NBT data (how it handles it for
 creative players) instead of routing it through the LootableBuilder.
 
 diff --git a/src/main/java/net/minecraft/server/level/PlayerInteractManager.java b/src/main/java/net/minecraft/server/level/PlayerInteractManager.java
-index 7302554063ac7b5dedaff895cba33b70234008e6..151da6c134f908d9037fddc5b54e71b069680e56 100644
+index e80d80b230cde5ca9278691313f556147229013b..b3cdff511a72edeecb73e1f508f0cd7f62a57673 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerInteractManager.java
-@@ -440,7 +440,7 @@ public class PlayerInteractManager {
+@@ -407,7 +407,7 @@ public class PlayerInteractManager {
                      block.postBreak(this.world, blockposition, iblockdata);
                  }
  
diff --git a/patches/server-unmapped/0218-Bee-can-work-when-raining-or-at-night.patch b/patches/server-unmapped/0215-Bee-can-work-when-raining-or-at-night.patch
similarity index 100%
rename from patches/server-unmapped/0218-Bee-can-work-when-raining-or-at-night.patch
rename to patches/server-unmapped/0215-Bee-can-work-when-raining-or-at-night.patch
diff --git a/patches/server-unmapped/0219-API-for-any-mob-to-burn-daylight.patch b/patches/server-unmapped/0216-API-for-any-mob-to-burn-daylight.patch
similarity index 96%
rename from patches/server-unmapped/0219-API-for-any-mob-to-burn-daylight.patch
rename to patches/server-unmapped/0216-API-for-any-mob-to-burn-daylight.patch
index 008a44bad..abbd83832 100644
--- a/patches/server-unmapped/0219-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server-unmapped/0216-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 dcb8cff2671947140f5853b1f6d75ecc03ef368f..35c15afc3f4bbe10dc7638e926564f51285fda4c 100644
+index cccab56c26db13d36da61232bbe9733b1c4ae2e3..096d133c01025ea63aad4ab5a2711d21967554d2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1639,7 +1639,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -1395,7 +1395,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          }
      }
  
@@ -18,7 +18,7 @@ index dcb8cff2671947140f5853b1f6d75ecc03ef368f..35c15afc3f4bbe10dc7638e926564f51
          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition(this.locX(), 0.0D, this.locZ());
  
          if (this.world.isLoaded(blockposition_mutableblockposition)) {
-@@ -3869,5 +3869,17 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -3616,5 +3616,17 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
      public boolean processClick(EnumHand hand) {
          return false;
      }
@@ -37,10 +37,10 @@ index dcb8cff2671947140f5853b1f6d75ecc03ef368f..35c15afc3f4bbe10dc7638e926564f51
      // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-index 7cacd2b56fa96411d9fdf96d985d24fe835f9a91..d96630a64f132eecf5cb4c80302cf9dd6176ad7c 100644
+index 41af652c8ba15753dcae3cf6a96df188d5f34886..fb1f23105097f47aba00c1d4c850495fd3070b3d 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-@@ -1678,6 +1678,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1672,6 +1672,7 @@ public abstract class EntityInsentient extends EntityLiving {
  
      public boolean isInDaylight() { return this.eG(); } // Paper - OBFHELPER
      protected boolean eG() {
@@ -48,7 +48,7 @@ index 7cacd2b56fa96411d9fdf96d985d24fe835f9a91..d96630a64f132eecf5cb4c80302cf9dd
          if (this.world.isDay() && !this.world.isClientSide) {
              float f = this.aR();
              BlockPosition blockposition = this.getVehicle() instanceof EntityBoat ? (new BlockPosition(this.locX(), (double) Math.round(this.locY()), this.locZ())).up() : new BlockPosition(this.locX(), (double) Math.round(this.locY()), this.locZ());
-@@ -1688,6 +1689,9 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1682,6 +1683,9 @@ public abstract class EntityInsentient extends EntityLiving {
          }
  
          return false;
@@ -59,7 +59,7 @@ index 7cacd2b56fa96411d9fdf96d985d24fe835f9a91..d96630a64f132eecf5cb4c80302cf9dd
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index fa8df6ecede6ecb207e0e3390cc96c72d71a8a18..0eaa7facd7a9348d90721a64427c7fdfb59bf8ea 100644
+index 314516477a07ada0cc44f1d8826c9724be85e1a1..b3a43adda666e387afbca0b48e4d65c2867ba8de 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -237,6 +237,7 @@ public abstract class EntityLiving extends Entity {
@@ -333,10 +333,10 @@ index 677f866dfaab653b05c693663adaeb2465117a55..81ceeff37f7e03eead177cbd49f79a74
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index af69023b241560031f6aa116561d7407b2502578..f0a16fae2ddba2e3deeb09f04c02972495a53137 100644
+index b1bb47992451b5e76d1cbe5b2bee550af583f818..2497384b4817aa288b55811ada1eb0f470877550 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1203,5 +1203,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1194,5 +1194,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          entity.setLocation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
          return !entity.valid && entity.world.addEntity(entity, spawnReason);
      }
diff --git a/patches/server-unmapped/0220-Fix-advancement-triggers-on-entity-death.patch b/patches/server-unmapped/0217-Fix-advancement-triggers-on-entity-death.patch
similarity index 95%
rename from patches/server-unmapped/0220-Fix-advancement-triggers-on-entity-death.patch
rename to patches/server-unmapped/0217-Fix-advancement-triggers-on-entity-death.patch
index 5124d14c7..3d36451a0 100644
--- a/patches/server-unmapped/0220-Fix-advancement-triggers-on-entity-death.patch
+++ b/patches/server-unmapped/0217-Fix-advancement-triggers-on-entity-death.patch
@@ -16,7 +16,7 @@ restoring it back to the entity just before the criterion triggers run and
 then finally clearing the equipment again right after the criterion is done.
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-index d96630a64f132eecf5cb4c80302cf9dd6176ad7c..b4afd71340a0c7e1b6aa2e3f01a6a4fc998f3f16 100644
+index fb1f23105097f47aba00c1d4c850495fd3070b3d..b7c4805a17c562e711c3901e0988e3a86edef987 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 @@ -106,9 +106,9 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -31,7 +31,7 @@ index d96630a64f132eecf5cb4c80302cf9dd6176ad7c..b4afd71340a0c7e1b6aa2e3f01a6a4fc
      public final float[] dropChanceArmor;
      // private boolean canPickUpLoot; // CraftBukkit - moved up to EntityLiving
      public boolean persistent;
-@@ -1004,6 +1004,41 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -998,6 +998,41 @@ public abstract class EntityInsentient extends EntityLiving {
          }
      }
  
@@ -74,7 +74,7 @@ index d96630a64f132eecf5cb4c80302cf9dd6176ad7c..b4afd71340a0c7e1b6aa2e3f01a6a4fc
      public void setSlot(EnumItemSlot enumitemslot, ItemStack itemstack) {
          switch (enumitemslot.a()) {
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 0eaa7facd7a9348d90721a64427c7fdfb59bf8ea..158388410ea14b2df95635914844952bd52b8f87 100644
+index b3a43adda666e387afbca0b48e4d65c2867ba8de..cf216a128daf3e95c517ef60b108bd0a7d73d26e 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -1557,10 +1557,13 @@ public abstract class EntityLiving extends Entity {
@@ -151,10 +151,10 @@ index ddc1c3383cdc32fa832485f3922c74185731557a..e28a2d983ae7b83f435c9dea606a92e2
      public void setSlot(EnumItemSlot enumitemslot, ItemStack itemstack) {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
-index 24285b1b2264939fdfa6f7d6311772fa67be8680..383b4cacc8c9f4fd5d2a83f683e5174ea5025f61 100644
+index 934f097496d975c619300b20f3757fe75732184d..43d8cd45a016d4eb132993e83d4c9394fc7fd20b 100644
 --- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
 +++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
-@@ -1886,6 +1886,52 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1880,6 +1880,52 @@ public abstract class EntityHuman extends EntityLiving {
          return enumitemslot == EnumItemSlot.MAINHAND ? this.inventory.getItemInHand() : (enumitemslot == EnumItemSlot.OFFHAND ? (ItemStack) this.inventory.extraSlots.get(0) : (enumitemslot.a() == EnumItemSlot.Function.ARMOR ? (ItemStack) this.inventory.armor.get(enumitemslot.b()) : ItemStack.b));
      }
  
diff --git a/patches/server-unmapped/0221-Config-MobEffect-by-world.patch b/patches/server-unmapped/0218-Config-MobEffect-by-world.patch
similarity index 100%
rename from patches/server-unmapped/0221-Config-MobEffect-by-world.patch
rename to patches/server-unmapped/0218-Config-MobEffect-by-world.patch
diff --git a/patches/server-unmapped/0222-Beacon-Activation-Range-Configurable.patch b/patches/server-unmapped/0219-Beacon-Activation-Range-Configurable.patch
similarity index 100%
rename from patches/server-unmapped/0222-Beacon-Activation-Range-Configurable.patch
rename to patches/server-unmapped/0219-Beacon-Activation-Range-Configurable.patch
diff --git a/patches/server-unmapped/0223-Add-toggle-for-sand-duping-fix.patch b/patches/server-unmapped/0220-Add-toggle-for-sand-duping-fix.patch
similarity index 100%
rename from patches/server-unmapped/0223-Add-toggle-for-sand-duping-fix.patch
rename to patches/server-unmapped/0220-Add-toggle-for-sand-duping-fix.patch
diff --git a/patches/server-unmapped/0224-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server-unmapped/0221-Add-toggle-for-end-portal-safe-teleporting.patch
similarity index 95%
rename from patches/server-unmapped/0224-Add-toggle-for-end-portal-safe-teleporting.patch
rename to patches/server-unmapped/0221-Add-toggle-for-end-portal-safe-teleporting.patch
index 6eab623ed..92820596a 100644
--- a/patches/server-unmapped/0224-Add-toggle-for-end-portal-safe-teleporting.patch
+++ b/patches/server-unmapped/0221-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 35c15afc3f4bbe10dc7638e926564f51285fda4c..18e5110047f13c213e70d3e094b94fecb4408d18 100644
+index 096d133c01025ea63aad4ab5a2711d21967554d2..15f68f3431f451ec5e889c729e767d29bae4dc9d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2603,7 +2603,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2356,7 +2356,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
              }
  
              this.E();
diff --git a/patches/server-unmapped/0225-Flying-Fall-Damage-API.patch b/patches/server-unmapped/0222-Flying-Fall-Damage-API.patch
similarity index 85%
rename from patches/server-unmapped/0225-Flying-Fall-Damage-API.patch
rename to patches/server-unmapped/0222-Flying-Fall-Damage-API.patch
index 25713a6f9..2bc11294d 100644
--- a/patches/server-unmapped/0225-Flying-Fall-Damage-API.patch
+++ b/patches/server-unmapped/0222-Flying-Fall-Damage-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
-index 383b4cacc8c9f4fd5d2a83f683e5174ea5025f61..be7c38c54311d6ea99a4ce2eec63863b649de3b2 100644
+index 43d8cd45a016d4eb132993e83d4c9394fc7fd20b..64f94334e6bd0517404b8614c96cbb2c5cdb67d2 100644
 --- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
 +++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
 @@ -169,7 +169,10 @@ public abstract class EntityHuman extends EntityLiving {
@@ -20,7 +20,7 @@ index 383b4cacc8c9f4fd5d2a83f683e5174ea5025f61..be7c38c54311d6ea99a4ce2eec63863b
  
      // CraftBukkit start
      public boolean fauxSleeping;
-@@ -1651,7 +1654,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1645,7 +1648,7 @@ public abstract class EntityHuman extends EntityLiving {
  
      @Override
      public boolean b(float f, float f1) {
@@ -30,10 +30,10 @@ index 383b4cacc8c9f4fd5d2a83f683e5174ea5025f61..be7c38c54311d6ea99a4ce2eec63863b
          } else {
              if (f >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0501d5bee249ac35e6344dfa1bed3d802901f377..9ecad2520740cc1c8f7017eaa935460777d0c191 100644
+index ecc655ae9414ceb08a92db6fce2e339ee10ea27b..cc09f3fb53112108b3d1213b443d7373cac95885 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2541,5 +2541,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2486,5 +2486,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSpawnInvulnerableTicks(int invulnerableTicks) {
          getHandle().invulnerableTicks = invulnerableTicks;
      }