9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-29 20:09:17 +00:00

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)
This commit is contained in:
Dreeam
2025-04-12 16:47:06 -04:00
parent 4c9fb21bb9
commit caf961ac08
3 changed files with 5 additions and 5 deletions

View File

@@ -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"

View File

@@ -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

View File

@@ -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"