From caf961ac088d97732b8e29a4ec8744fbb1cdf9c9 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Sat, 12 Apr 2025 16:47:06 -0400
Subject: [PATCH] Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@135e2c41 Updated Upstream (Paper)
PurpurMC/Purpur@e19b6707 Updated Upstream (Paper)
PurpurMC/Purpur@304174ec Updated Upstream (Paper)
PurpurMC/Purpur@4a3b139f Updated Upstream (Paper)
PurpurMC/Purpur@a14011f4 Updated Upstream (Paper)
PurpurMC/Purpur@3a1b29a9 [ci/skip] Updated Upstream (Paper)
PurpurMC/Purpur@5d1df704 Updated Upstream (Paper)
PurpurMC/Purpur@bc8c597b Updated Upstream (Paper)
PurpurMC/Purpur@ca56b414 Updated Upstream (Paper)
PurpurMC/Purpur@75efb975 Updated Upstream (Paper)
PurpurMC/Purpur@9249a2ca Updated Upstream (Paper)
PurpurMC/Purpur@8c293626 [ci/skip] ignore deprecation or removal warnings
PurpurMC/Purpur@65b1288b Updated Upstream (Paper)
PurpurMC/Purpur@96f0ee1e Add check for max growth age special case (#1652)
---
 .../paper-patches/features/0004-Purpur-API-Changes.patch    | 2 +-
 .../features/0007-Purpur-Server-Minecraft-Changes.patch     | 6 +++---
 .../features/0005-Purpur-Server-Paper-Changes.patch         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/leaf-api/paper-patches/features/0004-Purpur-API-Changes.patch b/leaf-api/paper-patches/features/0004-Purpur-API-Changes.patch
index 0aca8929..85237c48 100644
--- a/leaf-api/paper-patches/features/0004-Purpur-API-Changes.patch
+++ b/leaf-api/paper-patches/features/0004-Purpur-API-Changes.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: b34d675fef91bae2df723705f2568c7afd552d2d
+Commit: 96f0ee1ea36729daa5cf6265c9cbae2849bcfd3b
 
 Patches listed below are removed in this patch, They exists in Gale or Leaf:
 * "co/aikar/timings/TimedEventExecutor.java.patch"
diff --git a/leaf-server/minecraft-patches/features/0007-Purpur-Server-Minecraft-Changes.patch b/leaf-server/minecraft-patches/features/0007-Purpur-Server-Minecraft-Changes.patch
index de6d525b..9a85a58e 100644
--- a/leaf-server/minecraft-patches/features/0007-Purpur-Server-Minecraft-Changes.patch
+++ b/leaf-server/minecraft-patches/features/0007-Purpur-Server-Minecraft-Changes.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur Server Minecraft Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: b34d675fef91bae2df723705f2568c7afd552d2d
+Commit: 96f0ee1ea36729daa5cf6265c9cbae2849bcfd3b
 
 Patches listed below are removed in this patch, They exists in Gale or Leaf:
 * "net/minecraft/CrashReport.java.patch"
@@ -15451,7 +15451,7 @@ index 1fdede769b67cb5d2f9159c779f19e3639bb6ff5..2ff5457300d66378dbbea492deff0136
      }
  
 diff --git a/net/minecraft/world/level/block/GrowingPlantHeadBlock.java b/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
-index 0994f7265322d1f33365a1df0faaffd9df05fcc0..5dc1883ecd6e52666f553f30c150843c99fbef08 100644
+index 0994f7265322d1f33365a1df0faaffd9df05fcc0..b81c7cabb4c9f81de6d4c6b8ffde70e8a07d8fd1 100644
 --- a/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
 +++ b/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
 @@ -34,12 +34,12 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
@@ -15459,7 +15459,7 @@ index 0994f7265322d1f33365a1df0faaffd9df05fcc0..5dc1883ecd6e52666f553f30c150843c
      @Override
      public BlockState getStateForPlacement(RandomSource random) {
 -        return this.defaultBlockState().setValue(AGE, Integer.valueOf(random.nextInt(25)));
-+        return this.defaultBlockState().setValue(AGE, Integer.valueOf(random.nextInt(getMaxGrowthAge()))); // Purpur - kelp, cave, weeping, and twisting configurable max growth age
++        return this.defaultBlockState().setValue(AGE, Integer.valueOf(getMaxGrowthAge() == 0 ? 0 : random.nextInt(getMaxGrowthAge()))); // Purpur - kelp, cave, weeping, and twisting configurable max growth age
      }
  
      @Override
diff --git a/leaf-server/paper-patches/features/0005-Purpur-Server-Paper-Changes.patch b/leaf-server/paper-patches/features/0005-Purpur-Server-Paper-Changes.patch
index df829a25..26010e8a 100644
--- a/leaf-server/paper-patches/features/0005-Purpur-Server-Paper-Changes.patch
+++ b/leaf-server/paper-patches/features/0005-Purpur-Server-Paper-Changes.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur Server Paper Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: b34d675fef91bae2df723705f2568c7afd552d2d
+Commit: 96f0ee1ea36729daa5cf6265c9cbae2849bcfd3b
 
 Patches listed below are removed in this patch, They exists in Gale or Leaf:
 * "Rebrand.patch"