Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@848a396 Add mob goal generator (#9980) PaperMC/Paper@ebf97bd [ci skip] Add more patch identifying comments PaperMC/Paper@94807a1 [ci skip] Minor cleanup and patch merges
2025-01-18 12:14:42 +08:00 · 2024-01-16 15:33:16 -08:00 · 2024-01-16 15:33:16 -08:00 · 3d52f066c1
commit 3d52f066c1
parent 486515bc3c
67 changed files with 194 additions and 189 deletions
--- a/.gitignore
+++ b/.gitignore
@ -56,4 +56,5 @@ build-data/
 Purpur-API
 Purpur-MojangAPI
 Purpur-Server
+paper-api-generator
 *.jar
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -76,18 +76,23 @@ paperweight {
            serverPatchDir = layout.projectDirectory.dir("patches/server")
            serverOutputDir = layout.projectDirectory.dir("Purpur-Server")
        }
+
+        patchTasks.register("generatedApi") {
+            isBareDirectory = true
+            upstreamDirPath = "paper-api-generator/generated"
+            patchDir = layout.projectDirectory.dir("patches/generated-api")
+            outputDir = layout.projectDirectory.dir("paper-api-generator/generated")
+        }
    }
 }

 tasks.generateDevelopmentBundle {
    apiCoordinates = "org.purpurmc.purpur:purpur-api"
    mojangApiCoordinates = "io.papermc.paper:paper-mojangapi"
-    libraryRepositories.set(
-        listOf(
-            "https://repo.maven.apache.org/maven2/",
-            paperMavenPublicUrl,
-            "https://repo.purpurmc.org/snapshots",
-        )
+    libraryRepositories = listOf(
+        "https://repo.maven.apache.org/maven2/",
+        paperMavenPublicUrl,
+        "https://repo.purpurmc.org/snapshots",
    )
 }

--- a/gradle.properties
+++ b/gradle.properties
@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.4-R0.1-SNAPSHOT

 mcVersion = 1.20.4
-paperCommit = 0ef59845bf75aac7d8f0d03003a2f4a3c82b918d
+paperCommit = 94807a1d2e74b26b1a3154974d4024daa4c95f51

 org.gradle.caching = true
 org.gradle.parallel = true
--- a/patches/api/0007-Ridables.patch
+++ b/patches/api/0007-Ridables.patch
@ -4,23 +4,6 @@ Date: Sat, 4 May 2019 00:57:16 -0500
 Subject: [PATCH] Ridables


-diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 0c4dbb9ef63fa8575b5546239443cb2bd91ba847..4160e968e7d7e8e2a953534a981a7330916ece2e 100644
--- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-+++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -198,6 +198,12 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
-     GoalKey<Mob> CLIMB_ON_TOP_OF_POWDER_SNOW = GoalKey.of(Mob.class, NamespacedKey.minecraft("climb_on_top_of_powder_snow"));
-     GoalKey<Wolf> WOLF_PANIC = GoalKey.of(Wolf.class, NamespacedKey.minecraft("wolf_panic"));
- 
-+    // Purpur start
-+    GoalKey<Mob> MOB_HAS_RIDER = GoalKey.of(Mob.class, NamespacedKey.minecraft("has_rider"));
-+    GoalKey<AbstractHorse> HORSE_HAS_RIDER = GoalKey.of(AbstractHorse.class, NamespacedKey.minecraft("horse_has_rider"));
-+    GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
-+    // Purpur end
-+
-     /**
-      * @deprecated removed in 1.20.2
-      */
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
 index 1d0fd7ff8449f815a7d980af0b378181ea8bf8d8..566c74756c66db859a4f738a7716a61d012c6df1 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
--- a/patches/api/0018-LivingEntity-broadcastItemBreak.patch
+++ b/patches/api/0018-LivingEntity-broadcastItemBreak.patch
--- a/patches/api/0020-Item-entity-immunities.patch
+++ b/patches/api/0020-Item-entity-immunities.patch
--- a/patches/api/0021-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
+++ b/patches/api/0021-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add predicate to recipe's ExactChoice ingredient


 diff --git a/src/main/java/org/bukkit/inventory/RecipeChoice.java b/src/main/java/org/bukkit/inventory/RecipeChoice.java
-index 523818cbb0d6c90481ec97123e7fe0e2ff4eea14..bfeb8171a723d84b94bfaacd8aaf7d4d48ecd051 100644
+index db8bcc66bdc4bedfffb4705db6338eda4c0ad29a..feda3ddfaaf37b6ee218a0e0b1fbc199899bd364 100644
 --- a/src/main/java/org/bukkit/inventory/RecipeChoice.java
 +++ b/src/main/java/org/bukkit/inventory/RecipeChoice.java
@@ -10,6 +10,7 @@ import java.util.function.Predicate;
--- a/patches/api/0022-Rabid-Wolf-API.patch
+++ b/patches/api/0022-Rabid-Wolf-API.patch
@ -4,18 +4,6 @@ Date: Tue, 8 Dec 2020 17:15:15 -0500
 Subject: [PATCH] Rabid Wolf API


-diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index ce2eb58b86cd638d91f2bf9a8da60db499685fc9..8671b9042df2e219921615144a6ca868fa346d77 100644
--- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-+++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -206,6 +206,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
-     GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
-     GoalKey<Drowned> DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager"));
-     GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
-+    GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));
-     // Purpur end
- 
-     /**
 diff --git a/src/main/java/org/bukkit/entity/Wolf.java b/src/main/java/org/bukkit/entity/Wolf.java
 index 84db38388bf7a58e66d6cd29620b4fe64b0a897e..82ebd99549ce9f9e6427a50cef424e9007735708 100644
 --- a/src/main/java/org/bukkit/entity/Wolf.java
--- a/patches/api/0023-PlayerBookTooLargeEvent.patch
+++ b/patches/api/0023-PlayerBookTooLargeEvent.patch
--- a/patches/api/0024-Full-netherite-armor-grants-fire-resistance.patch
+++ b/patches/api/0024-Full-netherite-armor-grants-fire-resistance.patch
--- a/patches/api/0025-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/api/0025-Add-EntityTeleportHinderedEvent.patch
--- a/patches/api/0026-Add-enchantment-target-for-bows-and-crossbows.patch
+++ b/patches/api/0026-Add-enchantment-target-for-bows-and-crossbows.patch
--- a/patches/api/0027-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/api/0027-API-for-any-mob-to-burn-daylight.patch
--- a/patches/api/0028-Add-back-player-spawned-endermite-API.patch
+++ b/patches/api/0028-Add-back-player-spawned-endermite-API.patch
--- a/patches/api/0029-Fix-default-permission-system.patch
+++ b/patches/api/0029-Fix-default-permission-system.patch
--- a/patches/api/0030-Summoner-API.patch
+++ b/patches/api/0030-Summoner-API.patch
--- a/patches/api/0031-Clean-up-version-command-output.patch
+++ b/patches/api/0031-Clean-up-version-command-output.patch
--- a/patches/api/0032-Extended-OfflinePlayer-API.patch
+++ b/patches/api/0032-Extended-OfflinePlayer-API.patch
--- a/patches/api/0033-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/api/0033-Added-the-ability-to-add-combustible-items.patch
--- a/patches/api/0034-Potion-NamespacedKey.patch
+++ b/patches/api/0034-Potion-NamespacedKey.patch
--- a/patches/api/0035-Grindstone-API.patch
+++ b/patches/api/0035-Grindstone-API.patch
--- a/patches/api/0036-Shears-can-have-looting-enchantment.patch
+++ b/patches/api/0036-Shears-can-have-looting-enchantment.patch
--- a/patches/api/0037-Lobotomize-stuck-villagers.patch
+++ b/patches/api/0037-Lobotomize-stuck-villagers.patch
--- a/patches/api/0038-Add-local-difficulty-api.patch
+++ b/patches/api/0038-Add-local-difficulty-api.patch
--- a/patches/api/0039-Remove-Timings.patch
+++ b/patches/api/0039-Remove-Timings.patch
--- a/patches/api/0040-Add-Bee-API.patch
+++ b/patches/api/0040-Add-Bee-API.patch
--- a/patches/api/0041-Debug-Marker-API.patch
+++ b/patches/api/0041-Debug-Marker-API.patch
--- a/patches/api/0042-Add-death-screen-API.patch
+++ b/patches/api/0042-Add-death-screen-API.patch
--- a/patches/api/0043-Add-item-packet-serialize-event.patch
+++ b/patches/api/0043-Add-item-packet-serialize-event.patch
--- a/patches/api/0044-Language-API.patch
+++ b/patches/api/0044-Language-API.patch
--- a/patches/api/0045-Add-log-suppression-for-LibraryLoader.patch
+++ b/patches/api/0045-Add-log-suppression-for-LibraryLoader.patch
--- a/patches/api/0046-Fire-Immunity-API.patch
+++ b/patches/api/0046-Fire-Immunity-API.patch
--- a/patches/api/0047-Added-goat-ram-event.patch
+++ b/patches/api/0047-Added-goat-ram-event.patch
--- a/patches/api/0048-Add-PreExplodeEvents.patch
+++ b/patches/api/0048-Add-PreExplodeEvents.patch
--- a/patches/api/0049-Stored-Bee-API.patch
+++ b/patches/api/0049-Stored-Bee-API.patch
--- a/patches/api/0050-Explorer-Map-API.patch
+++ b/patches/api/0050-Explorer-Map-API.patch
--- a/patches/api/0051-Add-hover-lines-API.patch
+++ b/patches/api/0051-Add-hover-lines-API.patch
--- a/patches/generated-api/0001-Ridables.patch
+++ b/patches/generated-api/0001-Ridables.patch
@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Sat, 4 May 2019 00:57:16 -0500
+Subject: [PATCH] Ridables
+
+
+diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+index 069f2668f5229b0368b796e65eef1648fba0a097..50dc058cd8ecade74be30c75907d07f349c4df87 100644
+--- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+@@ -442,6 +442,12 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+ 
+     GoalKey<Zombie> ZOMBIE_ATTACK_TURTLE_EGG = create("zombie_attack_turtle_egg", Zombie.class);
+ 
+    // Purpur start
+    GoalKey<Mob> MOB_HAS_RIDER = GoalKey.of(Mob.class, NamespacedKey.minecraft("has_rider"));
+    GoalKey<AbstractHorse> HORSE_HAS_RIDER = GoalKey.of(AbstractHorse.class, NamespacedKey.minecraft("horse_has_rider"));
+    GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
+    // Purpur end
+
+     /**
+      * Removed in 1.20.2
+      */
--- a/patches/generated-api/0002-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/generated-api/0002-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@ -4,11 +4,11 @@ Date: Sun, 28 Jun 2020 21:50:55 -0500
 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms


-diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 4160e968e7d7e8e2a953534a981a7330916ece2e..68326105d2e11bd2d94315c0da35a32d1510de08 100644
--- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-+++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -202,6 +202,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+index 50dc058cd8ecade74be30c75907d07f349c4df87..b3a1325786fffb1a585b3911c75c03d184e8a848 100644
+--- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+@@ -446,6 +446,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
     GoalKey<Mob> MOB_HAS_RIDER = GoalKey.of(Mob.class, NamespacedKey.minecraft("has_rider"));
     GoalKey<AbstractHorse> HORSE_HAS_RIDER = GoalKey.of(AbstractHorse.class, NamespacedKey.minecraft("horse_has_rider"));
     GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
--- a/patches/generated-api/0003-Add-option-to-disable-zombie-aggressiveness-towards-.patch
+++ b/patches/generated-api/0003-Add-option-to-disable-zombie-aggressiveness-towards-.patch
@ -5,11 +5,11 @@ Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers
 when lagging


-diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 68326105d2e11bd2d94315c0da35a32d1510de08..ce2eb58b86cd638d91f2bf9a8da60db499685fc9 100644
--- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-+++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -204,6 +204,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+index b3a1325786fffb1a585b3911c75c03d184e8a848..31c4d5da936f88e68c67c6e464b94563a47a0f34 100644
+--- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+@@ -448,6 +448,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
     GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
     GoalKey<Phantom> FIND_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("find_crystal"));
     GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
--- a/patches/generated-api/0004-Rabid-Wolf-API.patch
+++ b/patches/generated-api/0004-Rabid-Wolf-API.patch
@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Encode42 <me@encode42.dev>
+Date: Tue, 8 Dec 2020 17:15:15 -0500
+Subject: [PATCH] Rabid Wolf API
+
+
+diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+index 31c4d5da936f88e68c67c6e464b94563a47a0f34..a41aa6c187d60373630eb803cb69d58b85eacc98 100644
+--- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+@@ -450,6 +450,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+     GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
+     GoalKey<Drowned> DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager"));
+     GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
+    GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));
+     // Purpur end
+ 
+     /**
--- a/patches/generated-api/0005-Iron-golem-poppy-calms-anger.patch
+++ b/patches/generated-api/0005-Iron-golem-poppy-calms-anger.patch
@ -4,11 +4,11 @@ Date: Thu, 13 May 2021 21:38:01 -0500
 Subject: [PATCH] Iron golem poppy calms anger


-diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 8671b9042df2e219921615144a6ca868fa346d77..b347224c223569297ee67ac630a710fdf28748ea 100644
--- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-+++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -207,6 +207,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+index a41aa6c187d60373630eb803cb69d58b85eacc98..9b991201a2f6cc9feccccf7f4e7bcded64117764 100644
+--- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+@@ -451,6 +451,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
     GoalKey<Drowned> DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager"));
     GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
     GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@ -1575,7 +1575,7 @@ index 9d7e1b306f8c96883dbe1adbf7e77825da4cbc21..80e1dcef1eeb33f553c7d771a00d463e
         }
     }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 4a473f75c1c14549acd134c20adbe0c52663405f..5996b5ae5b53f2c9ed2c2c9f5a3c25e300f5e90f 100644
+index 4160fff108cc83bc0a1f0a0389ab22f722d483b4..e4a6110a00c9ae78aafa13668e2ec2ea5f394b37 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -243,7 +243,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@ -1753,7 +1753,7 @@ index b6e5a2fa247bdee2f681739a26630dff3fc6c51a..e385a62058204ba3b01ce594e7c180f9
                         this.wasOnGround = this.entity.onGround();
                         this.teleportDelay = 0;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a1fd04399ef61d0257d1e4a6bb627e4a1b7a7ceb..c80dc73d7fd7d6cf3b87d1626129273e944d6649 100644
+index e0dae41eb94da08649cba607975798dc2ac328ad..f7215d0a67e9e024af0c040c796ebcbb4f76e885 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -899,6 +899,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@ -1842,7 +1842,7 @@ index a1fd04399ef61d0257d1e4a6bb627e4a1b7a7ceb..c80dc73d7fd7d6cf3b87d1626129273e
 
     public <T extends Entity> List<? extends T> getEntities(EntityTypeTest<Entity, T> filter, Predicate<? super T> predicate) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 75a763afecd63ab1b4c020460da58c8364e950b7..f29808e52fd095eea4f869091d4aed84bb90c7d9 100644
+index 8568de90c39838e1627f286c5c3ca4b0f19002cb..04b0eb391bb524dd7af14b862d89c0f2494a8206 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1124,6 +1124,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@ -1979,7 +1979,7 @@ index d6cbe98e67fdbf8db46338a88ab1356dd63b50a3..20dd3a63b2f955b05a75eb240e33ae4c
     int LARGE_MAX_STACK_SIZE = 64;
     int DEFAULT_DISTANCE_LIMIT = 8;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 29853426230ef7e95c7060cf1a44870d369d5f68..b753d0a39e9e1a656ab5402bd0105d9e04869ac2 100644
+index 14fbaef2215f7de4acb5303ad6f677b348f855d8..a8d8d261daed2ebbbea3f4f356434942997ba541 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -309,7 +309,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@ -2125,7 +2125,7 @@ index 29853426230ef7e95c7060cf1a44870d369d5f68..b753d0a39e9e1a656ab5402bd0105d9e
             if (vec3d.length() > 0.0D) {
                 if (k1 > 0) {
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 4bede2ca556a3bbcfbde9709c8415c9ea94383de..922a579feabeebe11c4e0b735108db005b7f2a28 100644
+index 081937597a8984b52a1e92d4c6032c04c942116e..0ffd377dba738bd651b0c7f5ca0a0d61aaa1d82c 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
@@ -305,6 +305,8 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@ -2138,7 +2138,7 @@ index 4bede2ca556a3bbcfbde9709c8415c9ea94383de..922a579feabeebe11c4e0b735108db00
     private String descriptionId;
     @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 97dbd1c8c8b6301bb607079575589dcceab0f881..9d792b61ca36d95a1414141cf5c33b8d22abac17 100644
+index 4cbb1f5d904191e59395df0177e76e94faae764c..9b7e786d5ae6bdeeb96df6e9c4d1b24e1e856e58 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -2158,7 +2158,7 @@ index 97dbd1c8c8b6301bb607079575589dcceab0f881..9d792b61ca36d95a1414141cf5c33b8d
                     this.hurt(this.damageSources().inWall(), 1.0F);
                 } else if (flag && !this.level().getWorldBorder().isWithinBounds(this.getBoundingBox())) {
                     double d0 = this.level().getWorldBorder().getDistanceToBorder(this) + this.level().getWorldBorder().getDamageSafeZone();
-@@ -1408,6 +1407,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1409,6 +1408,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
         return this.getHealth() <= 0.0F;
     }
 
@ -2178,7 +2178,7 @@ index 97dbd1c8c8b6301bb607079575589dcceab0f881..9d792b61ca36d95a1414141cf5c33b8d
     @Override
     public boolean hurt(DamageSource source, float amount) {
         if (this.isInvulnerableTo(source)) {
-@@ -2001,6 +2013,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2002,6 +2014,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
         return this.lastClimbablePos;
     }
 
@ -2473,7 +2473,7 @@ index 68ecf0203e23cb6360d05bec18d9c1c413d84650..1f7f6e5995c00725bf66723c75620ec4
     protected SoundEvent getAmbientSound() {
         return SoundEvents.WITHER_AMBIENT;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index bd5996eef2d946e9d7765b6b315bc5951158810e..0d51f435f18f3f9d59a3241a0b7fa1c4af841b72 100644
+index 30627f330536b5c89b52452981f0a960b61e4268..ebbd0031da656c4b12debbf76a347da2865d50d1 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -333,11 +333,17 @@ public class EnderMan extends Monster implements NeutralMob {
@ -2547,7 +2547,7 @@ index 9f1b7c629644931074293151ed58a523ca6d488c..58a7e61e02b7d72326ed4d57ee514adb
         this.level().getProfiler().pop();
         super.customServerAiStep();
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 11935e5b16324af572b07c5b173708f5a91f8289..6b869c05bbdb13e23ecaa2c38e0cb05bda5a083d 100644
+index e12f1f11386fa723f62b51ed0cc5715c1812d2bf..1e6d61673b0e3252129c04edcfa1d7d436e8ecbe 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -142,6 +142,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@ -2761,7 +2761,7 @@ index 27b0a79f7a7c47047216aae42944bac2a2151181..a097cfc528f709c80575f35483b68783
         autorecipestackmanager.initialize(this); // Paper - better exact choice recipes
         int i = 0;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 00ff7de3fe0feb166a792c61aa81a1e201d7e928..3bf4aa21e2ad602bf9d85d3fcd4f43e0357ef221 100644
+index b05e11e6b091c7616df5a9bbef867b06cafe3dc3..2902c29cd7f0b99b84cff3664fc4ec15a383e41b 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -212,6 +212,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@ -3092,7 +3092,7 @@ index 27e8ee4507460b1cc72de692b41562b9f4f13929..1afac69b5bc7055d2adb07aea4755b87
 
     // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-index f0de72afad4bb571153436399386a6a8a70582a6..45b7527341fcb6d24f35318cedb522646b5ee1c2 100644
+index 9da74764a91bea7822c0444b48623b23e038d3f2..37228dc74463dddcc55301489c41aa253017f2d4 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
@@ -25,6 +25,7 @@ public class LevelChunkSection {
--- a/patches/server/0008-Ridables.patch
+++ b/patches/server/0008-Ridables.patch
@ -34,7 +34,7 @@ index de0f93e1a85754051315653f707b95753ff7dc70..41918e5fe6d55749204a9207efe305e2
             this.profiler.push(() -> {
                 return worldserver + " " + worldserver.dimension().location();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 916fa1ecef7a73b494d14c21c4db407d9d8316d7..535d1797b5176177277b2b6a43bb9ff2ee936da1 100644
+index f29b3dc2243138783ba1d5ec852a8e4c2400150c..dda4a2e46e085190697adc60311abc43031bbf2e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -224,6 +224,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@ -46,7 +46,7 @@ index 916fa1ecef7a73b494d14c21c4db407d9d8316d7..535d1797b5176177277b2b6a43bb9ff2
         final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
         io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 633359a46028918e419e7da34f003f14fe8b3434..ee865a6b1492b9865bd36340db61a93a474a915e 100644
+index 849b4190976722179ce4b90aa2bad1dd6cfbadc7..c0b18bf97c8da4e843e08ccd39d4ef6d43295e54 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -763,6 +763,15 @@ public class ServerPlayer extends Player {
@ -66,7 +66,7 @@ index 633359a46028918e419e7da34f003f14fe8b3434..ee865a6b1492b9865bd36340db61a93a
 
     public void doTick() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f29808e52fd095eea4f869091d4aed84bb90c7d9..e2db5ed229bed05e4826e60aab4d3d2162eec601 100644
+index 04b0eb391bb524dd7af14b862d89c0f2494a8206..671b5deba9eb3afddc4d0af7ce5e61c11cddd303 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2724,6 +2724,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@ -79,7 +79,7 @@ index f29808e52fd095eea4f869091d4aed84bb90c7d9..e2db5ed229bed05e4826e60aab4d3d21
                             if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                                 entity.getEntityData().resendPossiblyDesyncedEntity(player); // Paper - The entire mob gets deleted, so resend it.
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3378414ae7c6103224d09e537a5e83d2852c9d73..dae5eb42eb1da596ddbbaf525818ee9601ecdc2f 100644
+index d7e664b9b1f19eeb74b380c90d25354b3f450421..5544a0d6bb1eac588a301261dcd96701be316cc8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -379,7 +379,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@ -190,7 +190,7 @@ index 1bb8b6e91c44cd13411d96d749fa64835c75a267..75c278b67ad2b78766efd8f89c4c2ca7
     protected ParticleOptions getInkParticle() {
         return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9d792b61ca36d95a1414141cf5c33b8d22abac17..bc83444129f9bd606450c8721bc0e65d3855cdb5 100644
+index 9b7e786d5ae6bdeeb96df6e9c4d1b24e1e856e58..120666439f235c976ba32a02b09c239ca79cb826 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -217,9 +217,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
@ -223,7 +223,7 @@ index 9d792b61ca36d95a1414141cf5c33b8d22abac17..bc83444129f9bd606450c8721bc0e65d
 
     @Override
     protected void checkFallDamage(double heightDifference, boolean onGround, BlockState state, BlockPos landedPosition) {
-@@ -2727,7 +2728,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2728,7 +2729,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
     }
 
     protected long lastJumpTime = 0L; // Paper
@ -232,7 +232,7 @@ index 9d792b61ca36d95a1414141cf5c33b8d22abac17..bc83444129f9bd606450c8721bc0e65d
         Vec3 vec3d = this.getDeltaMovement();
         // Paper start
         long time = System.nanoTime();
-@@ -3505,8 +3506,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3506,8 +3507,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
         this.pushEntities();
         this.level().getProfiler().pop();
         // Paper start
@ -245,7 +245,7 @@ index 9d792b61ca36d95a1414141cf5c33b8d22abac17..bc83444129f9bd606450c8721bc0e65d
                 Location from = new Location(this.level().getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO);
                 Location to = new Location (this.level().getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
                 io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone());
-@@ -3516,6 +3519,21 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3517,6 +3520,21 @@ public abstract class LivingEntity extends Entity implements Attackable {
                     this.absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
                 }
             }
@ -1090,7 +1090,7 @@ index e555fd8ca61e1ce7a52ecd475cc3ea11dedcab08..e818cf94d0a7def1f0abc8519e3b8ff4
             this.setAirSupply(this.getMaxAirSupply());
         } else {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index d17c69a857f083350cc9e9ec2b5dbe0a1482c85f..86c7b7d3c340372a5c33f8a848a274240c0e8554 100644
+index 3d771b137dc29579614aa4c15d12bd456cdc608a..8e1494f0f5a50dc16efebc8ab76a41d0cd355ff2 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
@@ -144,6 +144,44 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
@ -1340,7 +1340,7 @@ index 4300fab61765dd224fab084d118aae7294fc9de6..66f80ec010909648278c4e74c80d3766
         this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, false, false, Turtle.BABY_ON_LAND_SELECTOR));
     }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 089328028b9f82be3ddbfab42b6d0f015c4b71b5..f944a35c97e0a63714e04393ed6f44727c3fed2b 100644
+index ead5060ae2840a0519c5bf8b4b84aa12cc41b02a..9376de7391cfdd31f3f44da9a062bf23efd43561 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
@@ -114,6 +114,32 @@ public class Panda extends Animal {
@ -2265,7 +2265,7 @@ index 9158c5a507904c46a8fe2fdad9a0b6ba3a9b2460..877c1050e4c38943f6e8c3f81fa4f288
 
         }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 01b07320d8c94907e41283d5bc8943da2bbc6c6e..79f4a2d607a1cab694afb5cc571dbf59bc3cc7fa 100644
+index abd913079c00f335944c8eb590fd08bd518b1a10..a32535c8bb29afea3a3495796d71351603d162a2 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
@@ -86,6 +86,13 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
@ -3446,7 +3446,7 @@ index efc1d49c5bfea7d1674b8a9de2c8b617657eda0f..37afe706c5c453003ea96e62f376f45d
         return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896D).add(Attributes.ATTACK_DAMAGE, 8.0D).add(Attributes.MAX_HEALTH, 80.0D);
     }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 0d51f435f18f3f9d59a3241a0b7fa1c4af841b72..21e5102761876ceafce87fc824bf8392c354341a 100644
+index ebbd0031da656c4b12debbf76a347da2865d50d1..05f2b8c9813b2cdadb2aa8de445b8506ed4c2a30 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -98,9 +98,27 @@ public class EnderMan extends Monster implements NeutralMob {
@ -4781,7 +4781,7 @@ index 753defa8f8b48d004a2a53b2fc322fd9c083d95e..1d5c60c08354bb64a6d671032c2e8b88
     }
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index 94396ad1a3c280787d36c6c18256d10340ace488..3396acd9d361e05b8d7696d823c36c4fda945a23 100644
+index 7de9d012e7416eaa0189b513a0972c846e93c4b6..ba391ae0f8c361fb0ffbe0b65f12a008c21e4676 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
@@ -82,6 +82,23 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@ -5007,7 +5007,7 @@ index 58a7e61e02b7d72326ed4d57ee514adb63b3873c..63e4688d8055cf4a8883477f7943bf63
 
     public static void applyDarknessAround(ServerLevel world, Vec3 pos, @Nullable Entity entity, int range) {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 6b869c05bbdb13e23ecaa2c38e0cb05bda5a083d..4ae36a344143c5aed4266dfef2920ff3d83b1b48 100644
+index 1e6d61673b0e3252129c04edcfa1d7d436e8ecbe..8102f0beb58a6055e0b21c793e913d4eae96c348 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -157,6 +157,28 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@ -5114,7 +5114,7 @@ index 833563e237462ccfc1b730b8f5fb35340d0db854..2bed7b373813660139d2322dcd6b83f3
                     this.setTradingPlayer(player);
                     this.openTradingScreen(player, this.getDisplayName(), 1);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 5fffd5fde567affa51b3cf4bcc58249134a95e20..90d1508b6646cc4c1a54cc50af01cf090a549829 100644
+index 2668c3b6f752d5d8bc45f4e6e52c20cc6a36a957..19ed29dc7e4bcb9bedbb8c25174d48194132685e 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -194,6 +194,19 @@ public abstract class Player extends LivingEntity {
@ -5204,7 +5204,7 @@ index 1c3e1153d08b59d29b3613fc3b50a4780aa7a3ac..7c8b90444aa635cddf480d49a92a180a
 +    // Purpur end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 417e63d99216edd23d784ac5733432c541baf452..da5bbc3c677980e3a3ce97133577f7e0ca25a0f9 100644
+index 55c26840957f69860816c917c16f59d02074b388..b3d8e795683ab186295902aba7d476a689ff0f3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -591,6 +591,15 @@ public class CraftEventFactory {
@ -6668,16 +6668,3 @@ index 0000000000000000000000000000000000000000..18a95e043cbffa65eeaaf65ff7695e5d
 +        return super.canUse() && llama.isSaddled() && llama.isControllable();
 +    }
 +}
-diff --git a/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java
-index 654ed436e99dd56f1fe7c1d4f38da34d95ce9349..6453b1d4182a47367e89500ed4180ce75556b47d 100644
--- a/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java
-+++ b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java
-@@ -36,7 +36,7 @@ public class VanillaMobGoalTest {
-         }
- 
-         List<Class<?>> classes;
-        try (ScanResult scanResult = new ClassGraph().enableAllInfo().whitelistPackages("net.minecraft").scan()) {
-+        try (ScanResult scanResult = new ClassGraph().enableAllInfo().whitelistPackages("net.minecraft", "org.purpurmc.purpur.entity.ai").scan()) { // Purpur
-             classes = scanResult.getSubclasses(net.minecraft.world.entity.ai.goal.Goal.class.getName()).loadClasses();
-         }
- 
--- a/patches/server/0010-Barrels-and-enderchests-6-rows.patch
+++ b/patches/server/0010-Barrels-and-enderchests-6-rows.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Barrels and enderchests 6 rows


 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 05131b298048de6418cfa103d883039b55740dfa..04ac541f71bac6c8d26a92b61fd25574a49bbc1c 100644
+index 1fd58b708bb1d4ea374819a1fe4decf382589c76..d67557141f9ceb7d9eff63f8bfe1025b3716dc20 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1189,6 +1189,27 @@ public abstract class PlayerList {
@ -37,12 +37,12 @@ index 05131b298048de6418cfa103d883039b55740dfa..04ac541f71bac6c8d26a92b61fd25574
 
     public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 47057f51e034b6695d0b294eaf461dfe6aeedb19..0ef84c64cef519e40d2d611b290f098b14fe31c9 100644
+index 19ed29dc7e4bcb9bedbb8c25174d48194132685e..b494e11e21e88228cb4986fb8685184913275e95 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -183,6 +183,7 @@ public abstract class Player extends LivingEntity {
     public boolean affectsSpawning = true;
-     public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET;
+     public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
     // Paper end
 +    public int sixRowEnderchestSlotCount = -1; // Purpur
 
--- a/patches/server/0012-AFK-API.patch
+++ b/patches/server/0012-AFK-API.patch
@ -5,7 +5,7 @@ Subject: [PATCH] AFK API


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ee865a6b1492b9865bd36340db61a93a474a915e..dddcb463b9fc7856ab2cd58376662dcced73e223 100644
+index c0b18bf97c8da4e843e08ccd39d4ef6d43295e54..23084dd2f99f893138a3b24879ed1ae3358c0b3b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2234,8 +2234,68 @@ public class ServerPlayer extends Player {
@ -78,7 +78,7 @@ index ee865a6b1492b9865bd36340db61a93a474a915e..dddcb463b9fc7856ab2cd58376662dcc
         return this.stats;
     }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e2db5ed229bed05e4826e60aab4d3d2162eec601..534b072024d6d2f6a23b3e8fde7fe685c961d4c9 100644
+index 671b5deba9eb3afddc4d0af7ce5e61c11cddd303..5c20086f0eb457568f8e091a240e7fc5e5364643 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -325,6 +325,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@ -165,13 +165,13 @@ index 823efad652d8ff9e96b99375b102fef6f017716e..caa8a69bde0c212c36dd990a67836ac2
                 }
                 // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-index 2986c3b1c9dd7f3a00ed7f25b25bfc2b513b35eb..8d199ed2f0b2f50a57f9854cc14005489ecb2976 100644
+index dbbce471c35849ea7d7ad07e9db9b7d8d85690df..5eb63d857fea0f1c4dc1e6e4c7af8ea653dc7963 100644
 --- a/src/main/java/net/minecraft/world/entity/EntitySelector.java
 +++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java
@@ -40,6 +40,7 @@ public final class EntitySelector {
         return net.minecraft.util.Mth.clamp(serverPlayer.getStats().getValue(net.minecraft.stats.Stats.CUSTOM.get(net.minecraft.stats.Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE) >= playerInsomniaTicks;
     };
-     // Paper end
+     // Paper end - Ability to control player's insomnia and phantoms
 +    public static Predicate<Player> notAfk = (player) -> !player.isAfk(); // Purpur
 
     private EntitySelector() {}
@ -192,7 +192,7 @@ index ac5e5676b194a2a99e5cf53eb89c1152cac963b8..872454743f6dedc27519a13566559195
             if (baseEntity == null) {
                 if (this.isCombat && (!targetEntity.canBeSeenAsEnemy() || targetEntity.level().getDifficulty() == Difficulty.PEACEFUL)) {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 81683f667ff24a960ca25ebc1b0136af27fa8a2b..d014cf3b23b1ac40f3dc04f3766b50ad0913ab6b 100644
+index b494e11e21e88228cb4986fb8685184913275e95..71c0a6c896b0f608bc8bc494810723242e291c32 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -189,6 +189,13 @@ public abstract class Player extends LivingEntity {
@ -210,7 +210,7 @@ index 81683f667ff24a960ca25ebc1b0136af27fa8a2b..d014cf3b23b1ac40f3dc04f3766b50ad
     public CraftHumanEntity getBukkitEntity() {
         return (CraftHumanEntity) super.getBukkitEntity();
 diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index bb685325e6cb2ac5ddccfca8602013e38b4a4891..9e4506d132925d25d6aab7abfc893689503b0777 100644
+index ff0b7b9e4ae3aa0c170d05bc51fd7ff26e7531ee..53d4000593d4c79de8e8ab04bfd614b7ee0ad7a5 100644
 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java
 +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
@@ -191,7 +191,7 @@ public interface EntityGetter {
@ -223,7 +223,7 @@ index bb685325e6cb2ac5ddccfca8602013e38b4a4891..9e4506d132925d25d6aab7abfc893689
                 if (range < 0.0D || d < range * range) {
                     return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 628662ad8d9345bbb7e19241746cec9f8ff296ff..cf64a3f4ed4c730f93bed74c9f2df25e3a565827 100644
+index 69f8a65a396890176e5f1106f5560a3f5589f742..d678d2f374cc10d19879a4ebfcd601f34bb5edbc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -524,10 +524,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -317,7 +317,7 @@ index e248395ad5f5f012aeefecf367d54f90cade0996..70f53ccb22de2c05c9ead68f8bd29d0b
     public boolean untamedTamablesAreRidable = true;
     public boolean useNightVisionWhenRiding = false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index b8217bee667da63d3dd789f1a52646a8fa9fd632..08b266efbefc45e9b08b2c03a36441a8c7564197 100644
+index 651063863b451d24ffe39f0a4d8db296e58ff585..9c1452a4125af81c045933fce78ceb3963b787bf 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -203,6 +203,7 @@ public class ActivationRange
--- a/patches/server/0015-LivingEntity-safeFallDistance.patch
+++ b/patches/server/0015-LivingEntity-safeFallDistance.patch
@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3b7897cc4e282b682e83109a639b987a2c78fa07..6dc269ad7e5c84d5c87c11a7f6c0dcee7c13d66e 100644
+index e81bed7121b4f4bef5d7b5bd98979b790b2b92d7..5d55704235ba54ada99dc6107d0da25c80ad4172 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -252,6 +252,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@ -34,7 +34,7 @@ index 3b7897cc4e282b682e83109a639b987a2c78fa07..6dc269ad7e5c84d5c87c11a7f6c0dcee
             double d7 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
             int i = (int) (150.0D * d7);
 
-@@ -2094,7 +2095,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2095,7 +2096,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
             MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP);
             float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
 
--- a/patches/server/0022-Logger-settings-suppressing-pointless-logs.patch
+++ b/patches/server/0022-Logger-settings-suppressing-pointless-logs.patch
@ -17,7 +17,7 @@ index f655e0ae4a287886d0291cd0089bad2000249d0f..fcb5965ff0a9623a8e63a4b7413ad554
             } else {
                 this.startProgress(advancementholder, advancementprogress);
 diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index 14a5492428eac823a295ef3746d0aca6fbdab4ec..9bb669fd71cf412a090f340b3053b7cee87710f3 100644
+index 277c8e429481ca9763ddac9e700735d25aba78e9..3632957dfd39dc5dcb288fb86c0cadc37f1b4d27 100644
 --- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 +++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
@@ -318,6 +318,7 @@ public class WorldGenRegion implements WorldGenLevel {
@ -41,7 +41,7 @@ index 4103ddf16164e3992fef0765d368282572537e29..a0cb49233b1dbf53ce9d1bcc52b89678
                 } else {
                     handler.accept((RecipeHolder) optional.get());
 diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
-index 2677e21d8239bf0361a3bc5c9a50c328e54d70f6..544a79d5da661aff19e2019f7b83a3a49350bb68 100644
+index fde9aadd6c688b9797a6755f9d214918047598a0..ffaa80b645da3ddf2da828071090e01aa667504d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
 +++ b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
@@ -256,6 +256,7 @@ public final class CraftLegacy {
@ -49,7 +49,7 @@ index 2677e21d8239bf0361a3bc5c9a50c328e54d70f6..544a79d5da661aff19e2019f7b83a3a4
 
     static {
 +        if (!org.purpurmc.purpur.PurpurConfig.loggerSuppressInitLegacyMaterialError) // Purpur
-         LOGGER.warn("Initializing Legacy Material Support. Unless you have legacy plugins and/or data this is a bug!"); // Paper - doesn't need to be an error
+         LOGGER.warn("Initializing Legacy Material Support. Unless you have legacy plugins and/or data this is a bug!"); // Paper - Improve logging and errors; doesn't need to be an error
         if (MinecraftServer.getServer() != null && MinecraftServer.getServer().isDebugging()) {
             new Exception().printStackTrace();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
--- a/patches/server/0041-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/server/0041-Disable-loot-drops-on-death-by-cramming.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Disable loot drops on death by cramming


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0dceaee37d67d64f73d0434f480934aab320b0e6..4d0332666d705610d3e48c96462ef655f2fd2ed5 100644
+index 5d55704235ba54ada99dc6107d0da25c80ad4172..65a3949679b3d600b972eb6058af6eebc7367d6a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1840,6 +1840,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1841,6 +1841,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
 
         this.dropEquipment(); // CraftBukkit - from below
         if (this.shouldDropLoot() && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
@ -16,7 +16,7 @@ index 0dceaee37d67d64f73d0434f480934aab320b0e6..4d0332666d705610d3e48c96462ef655
             this.dropFromLootTable(source, flag);
             // Paper start
             final boolean prev = this.clearEquipmentSlots;
-@@ -1848,6 +1849,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1849,6 +1850,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
             // Paper end
             this.dropCustomDeathLoot(source, i, flag);
             this.clearEquipmentSlots = prev; // Paper
@ -25,7 +25,7 @@ index 0dceaee37d67d64f73d0434f480934aab320b0e6..4d0332666d705610d3e48c96462ef655
         // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment
         org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops, () -> {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 269fa073b53b5434d19d6705eb2fb2d0550ba0ac..9832d71949025eed99a3e9e8b09f9bee9991e36a 100644
+index 24dcdf3ca52129d3d35902c94ae302e35385cd50..f74721f815ffb066dba8741cd50ffed87de9754c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -95,6 +95,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0054-Configurable-void-damage-height-and-damage.patch
+++ b/patches/server/0054-Configurable-void-damage-height-and-damage.patch
@ -5,7 +5,7 @@ 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 08b01dd22f4cef8e866a05f6a281afee8cd1d95e..b4d249de8471499f17fc61a21b9d738f7d329f38 100644
+index 94f5c8de371fba03debf37e36fb1c9fc9c8ce78c..f4b22c7916c79275f44079ca9796099b5e142f37 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -903,7 +903,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@ -18,10 +18,10 @@ index 08b01dd22f4cef8e866a05f6a281afee8cd1d95e..b4d249de8471499f17fc61a21b9d738f
             && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
             // Paper end
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8bda246a3a6bdbe55ec997dc5b843a47a011a32a..65f2d5bd669ea6a201d4258c266788f70c976c74 100644
+index 65a3949679b3d600b972eb6058af6eebc7367d6a..ae710015f2ef933fc61de4978f773e0014a80023 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2540,7 +2540,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2541,7 +2541,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
 
     @Override
     protected void onBelowWorld() {
--- a/patches/server/0060-Implement-elytra-settings.patch
+++ b/patches/server/0060-Implement-elytra-settings.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0b5e92a5b631da4c9b700e3d65297d639f792986..57ffb039cf27117ec1ec1c822f9693a8ef03f6b7 100644
+index ae710015f2ef933fc61de4978f773e0014a80023..1abf3eb5a32cf67212e74be69ab008af772eb378 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3566,7 +3566,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3567,7 +3567,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
                     int j = i / 10;
 
                     if (j % 2 == 0) {
@ -54,7 +54,7 @@ index 82b0bda3e35ec2157a477e1a17b2b46baadc97d9..0fc45b1048a1c4e0dc2bd1ae0437eecb
                     itemStack.shrink(1);
                     } else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 22451858d7a27f9e701b22e923be752ef5dfcafe..f6274690538d55becb9afe0d5a87213cb2e396a0 100644
+index 1d2a706a4eee7523bbe89bc18b6d9ddd80581c3a..ee621bad75053831d5c88c783fd8af6359d2c281 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -641,7 +641,7 @@ public final class ItemStack {
@ -99,7 +99,7 @@ index 5fab851b319847035fb1eefd0ab999de3ccc2cd8..f1d6db9382bec49f61657168fe56b067
                         entityhuman.startAutoSpinAttack(20);
                         if (entityhuman.onGround()) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index f4bc9248e2e7c156688fad9e0807cb46444dfa13..685553ad958249f2ec00ea1139e8bab58abf7bcb 100644
+index e6f132ad886d1db2383a8f07489f6da2aa863dae..9aab2c1dc14f9683953cb2876ee9471f603da629 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -112,6 +112,19 @@ public class PurpurWorldConfig {
--- a/patches/server/0061-Item-entity-immunities.patch
+++ b/patches/server/0061-Item-entity-immunities.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Item entity immunities


 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index d46e61640b241d32df05240dedd2c23f138725e6..c6ef510d335b8baea58c4491853414a52a06b66b 100644
+index e385a62058204ba3b01ce594e7c180f9cc6cf664..92ca330bee2f58bde93c8da12a8f5c14e29de540 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -73,7 +73,7 @@ public class ServerEntity {
@ -18,13 +18,13 @@ index d46e61640b241d32df05240dedd2c23f138725e6..c6ef510d335b8baea58c4491853414a5
     public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<ServerPlayerConnection> trackedPlayers) {
         this.trackedPlayers = trackedPlayers;
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index a39db702063887cf530f272deaf4f334047cc7d4..22d40d754624d2832e215c2774b591a0082cd240 100644
+index c34c698d389da29c9cfaa56cb8023e30416a14ba..7844ee584b917485ce5e490ad040c2c1d732eb1d 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -58,6 +58,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
     public boolean canMobPickup = true; // Paper
     private int despawnRate = -1; // Paper
-     public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper
+     public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API
 +    // Purpur start
 +    public boolean immuneToCactus = false;
 +    public boolean immuneToExplosion = false;
@ -117,7 +117,7 @@ index 81498941748d646ebe6495f4a7ce6953532144c6..14d6ff11c8b8b047ada5d308515e9d21
 +    // Purpur end
 }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 685553ad958249f2ec00ea1139e8bab58abf7bcb..6d46b1682a7c0b8c638a047177ff99ee8c47de9c 100644
+index 9aab2c1dc14f9683953cb2876ee9471f603da629..b5599360a524a55183b3a21f822b5cb24f59dc67 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -125,6 +125,49 @@ public class PurpurWorldConfig {
--- a/patches/server/0067-Add-phantom-spawning-options.patch
+++ b/patches/server/0067-Add-phantom-spawning-options.patch
@ -5,13 +5,13 @@ Subject: [PATCH] Add phantom spawning options


 diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-index dfeb3e336e06ef01f5401a362755030db942bb07..f74c5eda91a3d521763ec7bc33f23e0c62458cc2 100644
+index 7d7d37334321c844958ce09e77547dd61dcba6c8..e731fd6f196116f4995dc6de8ad06b1985abe22b 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
@@ -49,7 +49,7 @@ public class PhantomSpawner implements CustomSpawner {
                 int spawnAttemptMaxSeconds = world.paperConfig().entities.behavior.phantomsSpawnAttemptMaxSeconds;
                 this.nextTick += (spawnAttemptMinSeconds + randomsource.nextInt(spawnAttemptMaxSeconds - spawnAttemptMinSeconds + 1)) * 20;
-                 // Paper end
+                 // Paper end - Ability to control player's insomnia and phantoms
 -                if (world.getSkyDarken() < 5 && world.dimensionType().hasSkyLight()) {
 +                if (world.getSkyDarken() < world.purpurConfig.phantomSpawnMinSkyDarkness && world.dimensionType().hasSkyLight()) { // Purpur
                     return 0;
@ -40,7 +40,7 @@ index dfeb3e336e06ef01f5401a362755030db942bb07..f74c5eda91a3d521763ec7bc33f23e0c
                                             for (int l = 0; l < k; ++l) {
                                                 // Paper start
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 262c6a2b63316fda5fa98fa4fcfbc0985951f6ee..bf39a299c9876ab8385de7d00ce6fdf427e73a9e 100644
+index 522ffc7b0d7a028436c385da4809070fb6095c4c..28c92b79be65b35b691661f6d63c2f66c9a3a337 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1068,6 +1068,12 @@ public class PurpurWorldConfig {
--- a/patches/server/0068-Implement-bed-explosion-options.patch
+++ b/patches/server/0068-Implement-bed-explosion-options.patch
@ -5,15 +5,15 @@ Subject: [PATCH] Implement bed explosion options


 diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index 04b1aa22ac1df39d274f27d9c93e0492a8a673f8..ab11b017f0795f5ec8161a4831c463c780307eaa 100644
+index 2c1d03237d5b24b93807c7e97d969ace13d6a917..fc46e324f36ce4de4f3868a98ad9dd2c99b428af 100644
 --- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
@@ -106,7 +106,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
 
                 Vec3 vec3d = pos.getCenter();
 
-                world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK);
-+                if (world.purpurConfig.bedExplode) world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, (float) world.purpurConfig.bedExplosionPower, world.purpurConfig.bedExplosionFire, world.purpurConfig.bedExplosionEffect); // Purpur
+-                world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // Paper - add exploded state
+                if (world.purpurConfig.bedExplode) world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, (float) world.purpurConfig.bedExplosionPower, world.purpurConfig.bedExplosionFire, world.purpurConfig.bedExplosionEffect); // Paper - add exploded state // Purpur
                 return InteractionResult.SUCCESS;
             } else if ((Boolean) state.getValue(BedBlock.OCCUPIED)) {
                 if (!BedBlock.canSetSpawn(world)) return this.explodeBed(state, world, pos); // Paper - check explode first
@ -21,13 +21,13 @@ index 04b1aa22ac1df39d274f27d9c93e0492a8a673f8..ab11b017f0795f5ec8161a4831c463c7
 
                 Vec3 vec3d = blockposition.getCenter();
 
-                world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK);
-+                if (world.purpurConfig.bedExplode) world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, (float) world.purpurConfig.bedExplosionPower, world.purpurConfig.bedExplosionFire, world.purpurConfig.bedExplosionEffect); // Purpur
+-                world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // Paper - add exploded state
+                if (world.purpurConfig.bedExplode) world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, (float) world.purpurConfig.bedExplosionPower, world.purpurConfig.bedExplosionFire, world.purpurConfig.bedExplosionEffect); // Paper - add exploded state // Purpur
                 return InteractionResult.SUCCESS;
             }
         }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index bf39a299c9876ab8385de7d00ce6fdf427e73a9e..41f6e686da7068f51a32c2baca643d73072e2e86 100644
+index 28c92b79be65b35b691661f6d63c2f66c9a3a337..813d942b4edf3d4143565c694b444092fd577cc8 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -284,6 +284,27 @@ public class PurpurWorldConfig {
--- a/patches/server/0069-Implement-respawn-anchor-explosion-options.patch
+++ b/patches/server/0069-Implement-respawn-anchor-explosion-options.patch
@ -5,20 +5,20 @@ Subject: [PATCH] Implement respawn anchor explosion options


 diff --git a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-index 797ece59c10bdb60a86f71ca3b7bb95dbe0f1078..ff315a10bcc605dc4e02a8de6b7d4f10db543a6c 100644
+index ec7b5e089c2911c7833e3fd7db4018ca2e0d4e85..1734e2e9ac1e3e609cf58cfd8532433fc9559284 100644
 --- a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
@@ -148,7 +148,7 @@ public class RespawnAnchorBlock extends Block {
         };
         Vec3 vec3d = explodedPos.getCenter();
 
-        world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), explosiondamagecalculator, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // Paper
-+        if (world.purpurConfig.respawnAnchorExplode)world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), explosiondamagecalculator, vec3d, (float) world.purpurConfig.respawnAnchorExplosionPower, world.purpurConfig.respawnAnchorExplosionFire, world.purpurConfig.respawnAnchorExplosionEffect); // Paper // Purpur
+-        world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), explosiondamagecalculator, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // Paper - add exploded state
+        if (world.purpurConfig.respawnAnchorExplode)world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), explosiondamagecalculator, vec3d, (float) world.purpurConfig.respawnAnchorExplosionPower, world.purpurConfig.respawnAnchorExplosionFire, world.purpurConfig.respawnAnchorExplosionEffect);// Paper - add exploded state // Purpur
     }
 
     public static boolean canSetSpawn(Level world) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 41f6e686da7068f51a32c2baca643d73072e2e86..2950033152a4309ee21bb80b70f207bb1a175738 100644
+index 813d942b4edf3d4143565c694b444092fd577cc8..61aaa72034c4b8b964b65aab7b9edb4d3471bf93 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -324,6 +324,27 @@ public class PurpurWorldConfig {
--- a/patches/server/0078-Totems-work-in-inventory.patch
+++ b/patches/server/0078-Totems-work-in-inventory.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Totems work in inventory


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f3d882c889fc6eab2ced0efd0f17404ca6905a5d..1ff77c524464a256913b063bf621b850255885ba 100644
+index 55693713ca6a603f074b9526827a704909d619e6..a58e5dc0b1216f7f8cfc93c7a3f967cdd3b70df0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1630,6 +1630,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1631,6 +1631,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
                 }
             }
 
@ -28,7 +28,7 @@ index f3d882c889fc6eab2ced0efd0f17404ca6905a5d..1ff77c524464a256913b063bf621b850
             EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot);
             event.setCancelled(itemstack == null);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8f085e8ba40d3bd9fca27b18b9ee156bbffe6bc3..538c6f1cec00ef0ce8e793a5d205875d2d9aac92 100644
+index edd6bedd26f82335055580240e71f1d68a79739e..65c365cd330b8865f0aeb7781a8995cbfea62f18 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -243,6 +243,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0122-Add-mobGriefing-bypass-to-everything-affected.patch
+++ b/patches/server/0122-Add-mobGriefing-bypass-to-everything-affected.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b3930bf7f9d93203907d6b39e29dfea06087b8d1..43bbc2f776048f006ad5f7a80e83ae2e46baa939 100644
+index a58e5dc0b1216f7f8cfc93c7a3f967cdd3b70df0..29260e8898bb68f4bf31e0bb4b7c721eb5a94344 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1807,7 +1807,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1808,7 +1808,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
             boolean flag = false;
 
             if (this.dead && adversary instanceof WitherBoss) { // Paper
@ -18,7 +18,7 @@ index b3930bf7f9d93203907d6b39e29dfea06087b8d1..43bbc2f776048f006ad5f7a80e83ae2e
                     BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index e0ab53ad1a5c10a47d07d384f8f5a7abcbc1365d..b9fb6962da54decaed30c2e18cb377b56f41c34a 100644
+index 99c8999852f05b92795bbc2f243d7220b0869858..7203384094de96ceea810b3e2da21c145c12a31d 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -705,7 +705,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@ -79,7 +79,7 @@ index 4e2c23ccdf4e4a4d65b291dbe20952bae1838bff..0da884a833f6c707fea512e826658c3b
                         this.level.setBlock(blockposition1, Blocks.DIRT.defaultBlockState(), 2);
                     }
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
-index 509317a26c79f453335df1c19dc4c9ec570046af..8e4d673e4f2d7f50ea5ed13794da08b1d20e6665 100644
+index 5580a396a56c6e0f364a5368985ee99b9e2be0a8..3facfd6eee17cb0b59425494c966e19833660dd2 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
@@ -40,7 +40,7 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
@ -92,7 +92,7 @@ index 509317a26c79f453335df1c19dc4c9ec570046af..8e4d673e4f2d7f50ea5ed13794da08b1
         } else if (this.nextStartTick > 0) {
             --this.nextStartTick;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index fdab9a9ad76a0ad8f83ddbff278096637fd34a50..fc3ec667aa2b8c3fe537cda0aeddd2192c0bbedf 100644
+index 25937f3da809151bddc2d7fa058303d4f7602d65..95fcde9f1e8bb1567e117b386240c68c9a9999e8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
@@ -1385,7 +1385,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
@ -131,7 +131,7 @@ index 6fac5dbbbd9600e82b1dd1496680f551ab44313e..fd64a12c7f215f47d366af60882981c2
             }
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 21599595ccd33ab57bceaabb3c27d257cb0ba598..f5dfcf2aefebf9faabd962d6f331de88ae26eb26 100644
+index f76a96f79e8adac39b31e8a167ef280391571bd9..d276009a7c4f641f565bfaa97774e2c55750f9bd 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
@@ -604,7 +604,7 @@ public class EnderDragon extends Mob implements Enemy {
@ -144,7 +144,7 @@ index 21599595ccd33ab57bceaabb3c27d257cb0ba598..f5dfcf2aefebf9faabd962d6f331de88
                             // flag1 = this.level().removeBlock(blockposition, false) || flag1;
                             flag1 = true;
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 93cf322ea4943fea127dc89eed900a2ca21b096c..5e61463f5d25b42165813df43c30246dff8a4a7e 100644
+index 935adddc0ba26c93026b079747dd9c3e97d7421b..9acfdc58c93ec06346e717f4a0f80c6dd7f586ee 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
@@ -493,7 +493,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@ -157,7 +157,7 @@ index 93cf322ea4943fea127dc89eed900a2ca21b096c..5e61463f5d25b42165813df43c30246d
                     j = Mth.floor(this.getX());
                     int i1 = Mth.floor(this.getZ());
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index c8f1d2de8682761ef8d4d50302c211f32b086783..51524661a62cbfe5ff7a3b7d640260e911902b23 100644
+index 9fe10040e67c2679cda4254205217a363c10f883..cfcf37696e2eaf7a8341135fd5c28ad5ebccf80a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -549,7 +549,15 @@ public class EnderMan extends Monster implements NeutralMob {
@ -284,7 +284,7 @@ index 6b67eec90cd0dc1b20762514eac97f75fdbdf182..2dec28091d1816e9d4c749a5155e8303
             // CraftBukkit start - fire ExplosionPrimeEvent
             ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index a7653d8d7291a537c997364c6222bb84d45f7277..9daf8a85ed3f429bfb287d099be23bca847a7671 100644
+index f0a6251cc8f612b898231e505c47fd5b2bbb4973..8e13b5d3e89e49994ad9763be7e4f35dd58a9c5e 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
@@ -334,7 +334,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
@ -362,7 +362,7 @@ index f579911b06b66e94e6311d970e93cca33fa089c6..2c63579226409a1823d2e8990e7ffc42
                 }
                 // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-index 3897c7cee2ca0c269852153794aa0e07c5f5e565..189cec37228f88c97e1994c40c44461a3321df8b 100644
+index a98f04c892d6e11e311b16af36e824857dd3bc76..430ccf1b9f5c6306bbe610d1f9058c1a4bfa2986 100644
 --- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
@@ -220,7 +220,7 @@ public class TurtleEggBlock extends Block {
--- a/patches/server/0133-One-Punch-Man.patch
+++ b/patches/server/0133-One-Punch-Man.patch
@ -5,10 +5,10 @@ Subject: [PATCH] One Punch Man!


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b0071e7f3b540569364a53bc6c5c022d2ea8a7cf..5ac686c5d3fc20d55899eb7ffafa48c4130344cf 100644
+index 29260e8898bb68f4bf31e0bb4b7c721eb5a94344..3922a378360771d8a550c26debbed08222a57d6c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2333,6 +2333,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2334,6 +2334,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
                 }
             }
 
@ -30,7 +30,7 @@ index b0071e7f3b540569364a53bc6c5c022d2ea8a7cf..5ac686c5d3fc20d55899eb7ffafa48c4
                 if (human) {
                     // PAIL: Be sure to drag all this code from the EntityHuman subclass each update.
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9bd8d873933c4441d5055ea49239623d0fb480b1..a58369d384604e37906cc0d15aad40a9e44019da 100644
+index 96835763638abbc120f63a67a9ac4cb853739d78..bf2ab21a5390ac0876b0c2c5e6708cc3d6c564da 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -344,6 +344,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0162-Configurable-mob-blindness.patch
+++ b/patches/server/0162-Configurable-mob-blindness.patch
@ -6,10 +6,10 @@ Subject: [PATCH] Configurable mob blindness
 Ported from https://github.com/raltsmc/mobblindness

 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b320b4bc692efdd9f7efd4f3fa195bc26512cf66..879ddc26235e9361afe55fffb5ca64cb63dfe552 100644
+index a1b6a10a3f0409ad5dece7aaaf0de7d8dfe3f403..4154eb08be0d6492cfba931761671a6384390d1b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1035,6 +1035,17 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1036,6 +1036,17 @@ public abstract class LivingEntity extends Entity implements Attackable {
             if (entitytypes == EntityType.SKELETON && itemstack.is(Items.SKELETON_SKULL) || entitytypes == EntityType.ZOMBIE && itemstack.is(Items.ZOMBIE_HEAD) || entitytypes == EntityType.PIGLIN && itemstack.is(Items.PIGLIN_HEAD) || entitytypes == EntityType.PIGLIN_BRUTE && itemstack.is(Items.PIGLIN_HEAD) || entitytypes == EntityType.CREEPER && itemstack.is(Items.CREEPER_HEAD)) {
                 d0 *= 0.5D;
             }
@ -28,7 +28,7 @@ index b320b4bc692efdd9f7efd4f3fa195bc26512cf66..879ddc26235e9361afe55fffb5ca64cb
 
         return d0;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index eeba42faac3cf16be92054bd3f04eb761e257656..1af16bbaab355022d183e71828a866686347ec0f 100644
+index 907cf33cdc003a557aa13bb5234025fca9e260ae..4f363b9ed0f3427f86c39fdd5be49b94f0ee8221 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -132,6 +132,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0173-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0173-API-for-any-mob-to-burn-daylight.patch
@ -6,7 +6,7 @@ Subject: [PATCH] API for any mob to burn daylight
 Co-authored by: Encode42 <me@encode42.dev>

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f8a040f8170a01cc01cfe9ca5591f88cb56cde5d..d46a257d9c26938440d3d1907e85568f15f6f6c8 100644
+index 6fd094b30b0d8eee70674283ff6523133ee322ba..cc7c2463ef24b44f44575f245a27c5439c0b9be8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -503,6 +503,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@ -32,13 +32,13 @@ index f8a040f8170a01cc01cfe9ca5591f88cb56cde5d..d46a257d9c26938440d3d1907e85568f
         return this.hardCollides;
     }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 00a50a7228141a5dc48889e39accfe39a1ce6a28..7aa29c535591436edcbfe336be6257327b9d4097 100644
+index 4154eb08be0d6492cfba931761671a6384390d1b..338e9bef962f9090070a9c76e565c6aeab66975e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -262,6 +262,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
     public org.bukkit.craftbukkit.entity.CraftLivingEntity getBukkitLivingEntity() { return (org.bukkit.craftbukkit.entity.CraftLivingEntity) super.getBukkitEntity(); } // Paper
     public boolean silentDeath = false; // Paper - mark entity as dying silently for cancellable death event
-     public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper
+     public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API
 +    protected boolean shouldBurnInDay = false;  public boolean shouldBurnInDay() { return this.shouldBurnInDay; } public void setShouldBurnInDay(boolean shouldBurnInDay) { this.shouldBurnInDay = shouldBurnInDay; } // Purpur
 
     @Override
@ -51,7 +51,7 @@ index 00a50a7228141a5dc48889e39accfe39a1ce6a28..7aa29c535591436edcbfe336be625732
     }
 
     @Override
-@@ -887,6 +889,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -888,6 +890,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
             this.brain = this.makeBrain(new Dynamic(NbtOps.INSTANCE, nbt.get("Brain")));
         }
 
@ -63,7 +63,7 @@ index 00a50a7228141a5dc48889e39accfe39a1ce6a28..7aa29c535591436edcbfe336be625732
     }
 
     // CraftBukkit start
-@@ -3584,6 +3591,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3585,6 +3592,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
             this.hurt(this.damageSources().drown(), 1.0F);
         }
 
--- a/patches/server/0179-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
+++ b/patches/server/0179-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
@ -6,11 +6,11 @@ Subject: [PATCH] Burp delay, burp after eating food fills hunger bar


 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index f05a2c6d71af599da07cd08bb16f14ebd46dc7ee..5a05e16bfff41dbae6f887a457259a22101c4ee8 100644
+index 5260138c46ca499369ff9a1c4acccb594d2c431a..cbfa65a50cb07e825b62493668764ce9f2c4a3fd 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -184,6 +184,7 @@ public abstract class Player extends LivingEntity {
-     public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET;
+     public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
     // Paper end
     public int sixRowEnderchestSlotCount = -1; // Purpur
 +    public int burpDelay = 0; // Purpur
@ -55,7 +55,7 @@ index c3448707fd8a632b457cc97b35d08a9c6933d5ee..2840c0b16d9b8147703f34bac5a8aa21
 
     public void eat(Item item, ItemStack stack) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1e82dea915cdbf09cca47c753dc181c3e51a6fc1..d1d7e18bde867b53d61350d8503f1f15b7913527 100644
+index 9940ba58d5f32a4ffe68a99270dda87ff34b977a..79a93bb2ce4a86586bfac8635706a4c2d1d1f407 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -388,6 +388,8 @@ public class PurpurWorldConfig {
--- a/patches/server/0197-Toggle-for-kinetic-damage.patch
+++ b/patches/server/0197-Toggle-for-kinetic-damage.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Toggle for kinetic damage


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 09c24ff6dd0c8bdabc25e69101f229b982822ca5..2cefad6730dbd50e41917af287c041a13d81ba2e 100644
+index 338e9bef962f9090070a9c76e565c6aeab66975e..665bfee6a54269847cbab3669d771494a8dae422 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2931,6 +2931,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2932,6 +2932,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
 
                     if (f3 > 0.0F) {
                         this.playSound(this.getFallDamageSound((int) f3), 1.0F, 1.0F);
@ -17,7 +17,7 @@ index 09c24ff6dd0c8bdabc25e69101f229b982822ca5..2cefad6730dbd50e41917af287c041a1
                     }
                 }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index cc5e11524928bdec5402263eb68a51128b0503df..1714f839c688129184947c789731ac4d2b1c2fe1 100644
+index fd07ab7ce9eaec09429ecd75c93c57db437d5aa5..ad9f793abd559245f50e86c808d1fa401d266995 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -182,12 +182,14 @@ public class PurpurWorldConfig {
--- a/patches/server/0230-Mob-head-visibility-percent.patch
+++ b/patches/server/0230-Mob-head-visibility-percent.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Mob head visibility percent


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ef739e34184bbaca4a4eb8314357772934b4a065..19529564457dfb0d0a3231341b1a57b72a415d54 100644
+index 665bfee6a54269847cbab3669d771494a8dae422..1ea0a19f7acc2276c21de55d84175e38e2dad9a6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1039,9 +1039,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1040,9 +1040,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
             ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
             EntityType<?> entitytypes = entity.getType();
 
--- a/patches/server/0245-Config-for-mob-last-hurt-by-player-time.patch
+++ b/patches/server/0245-Config-for-mob-last-hurt-by-player-time.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Config for mob last hurt by player time


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 19529564457dfb0d0a3231341b1a57b72a415d54..6e7ed46a3a10a1ec69d0b69ee49be304760e419b 100644
+index 1ea0a19f7acc2276c21de55d84175e38e2dad9a6..4c75007bc1b700b9c4b79dce0b63c21fec6a742e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1545,13 +1545,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1546,13 +1546,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
                 if (entity1 instanceof net.minecraft.world.entity.player.Player) {
                     net.minecraft.world.entity.player.Player entityhuman = (net.minecraft.world.entity.player.Player) entity1;
 
--- a/patches/server/0265-Remove-Mojang-Profiler.patch
+++ b/patches/server/0265-Remove-Mojang-Profiler.patch
@ -448,7 +448,7 @@ index df0c15f6b5b2224d53e4f8fad42b9a1e5f33dc25..5dd0dcb47211cec69189115bf4eab1df
 
     }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index c2a1a05ace909576a160574ea98f89d6fea15338..fb415887408c8ca3712fb95a952bbfcfb22c5e12 100644
+index 87bbf12563d035b2b63a4d36095dc1cd8b624671..172c7b94830c13835e48d68a039bd66e7e7622b0 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -545,20 +545,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@ -626,7 +626,7 @@ index 9f438b41b61ee1174d8f23bcb7d93380ad932e9c..c3c47857515a7f75d69c718f352d8bae
         }
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 25e9bb866bb7c07c0a1f32a85441694acbc5ed3b..21b423282cc2c6a65b060dace7f58575a70faac8 100644
+index 3a06bf55d48ed96556ad9d389ab5ebaefeb078d9..1309c9e63095a0484ee0fa119a41c29ef1da3a01 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -829,16 +829,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
@ -848,7 +848,7 @@ index 25e9bb866bb7c07c0a1f32a85441694acbc5ed3b..21b423282cc2c6a65b060dace7f58575
 
                 while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b259f91f5e371eaeecc35ee0d4441c2992fb8796..4bc8a6e4a22cb1c21df1d6ee0223095dcf1a1ce9 100644
+index 5ca339100cb311faa87b978b3c8df36d24fea112..97fa5c65bb6fe53bada4c42d54a9f7c22dbfca38 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1240,7 +1240,7 @@ public class ServerPlayer extends Player {
@ -1107,7 +1107,7 @@ index 2e6e8eac987c4ef6b2dcd3de592d8a51d2b29792..863343a87fe34d72f04af89d75268b47
             };
         }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f574a59593ccbcf051a1c22756b6e05a8643ab31..8982bed656387e469e324097d627c892a36907d0 100644
+index d5f60a9e2557f687d3c1218559601526f349ecbe..ed7bc379d55b7fd8be1d18e388356a7e466bb75e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -852,7 +852,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@ -1233,7 +1233,7 @@ index f574a59593ccbcf051a1c22756b6e05a8643ab31..8982bed656387e469e324097d627c892
             }
         } else {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1157b24a44681951ac923b8a2509a8d058a672c9..7cfb725fced12d7febdc27ebba09ffc4c62c6d1d 100644
+index 4c75007bc1b700b9c4b79dce0b63c21fec6a742e..46230c0fbcfd565163abca17313a6f0ea5e63249 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -409,7 +409,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@ -1254,7 +1254,7 @@ index 1157b24a44681951ac923b8a2509a8d058a672c9..7cfb725fced12d7febdc27ebba09ffc4
     }
 
     public boolean canSpawnSoulSpeedParticle() {
-@@ -3164,10 +3164,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3165,10 +3165,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
         }
 
         this.run += (f3 - this.run) * 0.3F;
@ -1268,7 +1268,7 @@ index 1157b24a44681951ac923b8a2509a8d058a672c9..7cfb725fced12d7febdc27ebba09ffc4
 
         // Paper start - stop large pitch and yaw changes from crashing the server
         this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
-@@ -3179,7 +3179,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3180,7 +3180,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
         this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
         // Paper end
 
@ -1277,7 +1277,7 @@ index 1157b24a44681951ac923b8a2509a8d058a672c9..7cfb725fced12d7febdc27ebba09ffc4
         this.animStep += f2;
         if (this.isFallFlying()) {
             ++this.fallFlyTicks;
-@@ -3474,19 +3474,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3475,19 +3475,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
         }
 
         this.setDeltaMovement(d0, d1, d2);
@ -1302,7 +1302,7 @@ index 1157b24a44681951ac923b8a2509a8d058a672c9..7cfb725fced12d7febdc27ebba09ffc4
         if (this.jumping && this.isAffectedByFluids()) {
             double d3;
 
-@@ -3513,8 +3513,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3514,8 +3514,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
             this.noJumpDelay = 0;
         }
 
@ -1313,7 +1313,7 @@ index 1157b24a44681951ac923b8a2509a8d058a672c9..7cfb725fced12d7febdc27ebba09ffc4
         this.xxa *= 0.98F;
         this.zza *= 0.98F;
         this.updateFallFlying();
-@@ -3541,8 +3541,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3542,8 +3542,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
             this.travel(vec3d1);
         }
 
@ -1324,7 +1324,7 @@ index 1157b24a44681951ac923b8a2509a8d058a672c9..7cfb725fced12d7febdc27ebba09ffc4
         if (!this.level().isClientSide && !this.isDeadOrDying() && !this.freezeLocked) { // Paper - Freeze Tick Lock API
             int i = this.getTicksFrozen();
 
-@@ -3559,15 +3559,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3560,15 +3560,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
             this.hurt(this.damageSources().freeze(), 1.0F);
         }
 
@ -1580,7 +1580,7 @@ index b7eaa9e99688ae300c2e9176991c29828d1cc800..e4d529825e681bbc656113b1fd448943
             Optional<Integer> optional = this.getBrain().getMemory(MemoryModuleType.PLAY_DEAD_TICKS);
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index a841972e0d59b78649ffaeda9dff04de6c97ea08..e08477600eedcaa959165bc35d89f36787d95d96 100644
+index 30b19b64fdc9b03f15341831235492f4cdd9823a..b46942c5fafe216039426531a4dbb19bda02c084 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
@@ -158,13 +158,13 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
@ -1789,7 +1789,7 @@ index 63e4688d8055cf4a8883477f7943bf63520c0693..22263f219ce9e9f014abb76c43297c52
         if ((this.tickCount + this.getId()) % 120 == 0) {
             Warden.applyDarknessAround(worldserver, this.position(), this, 20);
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 576ac084a97a59f2bd3a1be3d70515649091e593..68404053233985cb830e95e287c81875a3b86957 100644
+index fb8fe6b74bf8c392192c846e05c109dbb364c0a9..27ebfda79d9c4463f157b99c2c56e256839b3a31 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -342,7 +342,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@ -1811,7 +1811,7 @@ index 576ac084a97a59f2bd3a1be3d70515649091e593..68404053233985cb830e95e287c81875
             this.assignProfessionWhenSpawned = false;
         }
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 9442f58dff89ec843c321533965fbee2727d02f8..17abd085b3faf88e10a44a6c98af996892cc4e58 100644
+index 210b6d71207b99e66ba014b176b2c1445053b1d1..82a58ca092371866566bac5f1efcca4964e59e60 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
@@ -659,7 +659,7 @@ public class Explosion {
@ -1833,7 +1833,7 @@ index 9442f58dff89ec843c321533965fbee2727d02f8..17abd085b3faf88e10a44a6c98af9968
 
         if (this.fire) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ca3b05db0a1cfdbac1307ff95bacd1acb83cb616..e754bea0e50c178ae210c19fa5784473210d5836 100644
+index fd0a9350e4b08daff437d4d054803d72aec5c950..b58402221840a9e72b30a31d884b0fb2d86883fd 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1315,9 +1315,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
--- a/patches/server/0280-Milk-Keeps-Beneficial-Effects.patch
+++ b/patches/server/0280-Milk-Keeps-Beneficial-Effects.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Milk Keeps Beneficial Effects


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f9e035405c42fbe0a8c0dca2157798d69214914b..8fd6e46882a1828abdf858c0b10f955c9f2718eb 100644
+index 46230c0fbcfd565163abca17313a6f0ea5e63249..3b1c09f8afe1a008df4b75b605a796bfb1bf3899 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1123,6 +1123,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1124,6 +1124,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
             for (flag = false; iterator.hasNext(); flag = true) {
                 // CraftBukkit start
                 MobEffectInstance effect = (MobEffectInstance) iterator.next();
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@ -32,7 +32,7 @@ if (!file(".git").exists()) {
 }

 rootProject.name = "purpur"
-for (name in listOf("Purpur-API", "Purpur-Server")) {
+for (name in listOf("Purpur-API", "Purpur-Server", "paper-api-generator")) {
    val projName = name.lowercase(Locale.ENGLISH)
    include(projName)
    findProject(":$projName")!!.projectDir = file(name)