1.21.1

2025-12-19 15:09:25 +00:00 · 2024-08-11 20:24:46 +08:00
parent ee6983aa20
commit aad915a149
12 changed files with 83 additions and 60 deletions
--- a/.github/workflows/auto-update.yml
+++ b/.github/workflows/auto-update.yml
@@ -51,7 +51,7 @@ jobs:

      - uses: actions/setup-java@v4
        with:
-          distribution: 'temurin'
+          distribution: 'zulu'
          java-version:  21

      - name: Running tests before push
--- a/.github/workflows/build-1211.yml
+++ b/.github/workflows/build-1211.yml
@@ -1,10 +1,10 @@
-name: Build Leaf 1.21
+name: Build Leaf 1.21.1

 on:
  push:
-    branches: [ "ver/1.21" ]
+    branches: [ "ver/1.21.1" ]
  pull_request:
-    branches: [ "ver/1.21" ]
+    branches: [ "ver/1.21.1" ]

 jobs:
  build:
@@ -33,8 +33,8 @@ jobs:

      - name: Rename Paperclip Jar
        run: |
-          mv build/libs/leaf-paperclip-1.21-R0.1-SNAPSHOT-mojmap.jar ./leaf-1.21-mojmap.jar
-          mv build/libs/leaf-paperclip-1.21-R0.1-SNAPSHOT-reobf.jar ./leaf-1.21-reobf.jar
+          mv build/libs/leaf-paperclip-1.21.1-R0.1-SNAPSHOT-mojmap.jar ./leaf-1.21.1-mojmap.jar
+          mv build/libs/leaf-paperclip-1.21.1-R0.1-SNAPSHOT-reobf.jar ./leaf-1.21.1-reobf.jar

 # Publish manually instead of using workflow
 #      - name: Publish API
@@ -50,19 +50,19 @@ jobs:
      - name: Upload Leaf
        uses: actions/upload-artifact@main
        with:
-          name: Leaf 1.21
-          path: ./leaf-1.21-*.jar
+          name: Leaf 1.21.1
+          path: ./leaf-1.21.1-*.jar

      - name: Rename Paperclip Jar
        run: |
-          mv ./leaf-1.21-mojmap.jar ./leaf-1.21.jar
+          mv ./leaf-1.21.1-mojmap.jar ./leaf-1.21.1.jar

      - name: Release Leaf
        if: github.event_name != 'pull_request'
        uses: marvinpinto/action-automatic-releases@master
        with:
-          title: "Leaf 1.21"
-          automatic_release_tag: "ver-1.21"
+          title: "Leaf 1.21.1"
+          automatic_release_tag: "ver-1.21.1"
          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          files: "./leaf-1.21.jar"
+          files: "./leaf-1.21.1.jar"
          prerelease: false
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 <div align="center">
 
 [![Github Releases](https://img.shields.io/badge/Download-Releases-blue?&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Leaf/releases)⠀
-[![Github Actions Build](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Leaf/build-121.yml?&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Leaf/actions)⠀
+[![Github Actions Build](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Leaf/build-1211.yml?&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Leaf/actions)⠀
 [![Discord](https://img.shields.io/discord/1145991395388162119?label=discord&style=for-the-badge&colorA=19201a&colorB=298046)](https://discord.gg/gfgAwdSEuM)

 **Leaf** is a drop-in replacement for [Paper](https://papermc.io/) servers designed to remove some checks, customized and high-performance, built on top of [Gale](https://github.com/GaleMC/Gale) with optimizations and fixes from other forks.
@@ -60,7 +60,7 @@ Building a Paperclip JAR for distribution:
 <dependency>
    <groupId>cn.dreeam.leaf</groupId>
    <artifactId>leaf-api</artifactId>
-    <version>1.21-R0.1-SNAPSHOT</version>
+    <version>1.21.1-R0.1-SNAPSHOT</version>
    <scope>provided</scope>
 </dependency>
 ```
@@ -73,7 +73,7 @@ repositories {
 }

 dependencies {
-    compileOnly("cn.dreeam.leaf:leaf-api:1.21-R0.1-SNAPSHOT")
+    compileOnly("cn.dreeam.leaf:leaf-api:1.21.1-R0.1-SNAPSHOT")
 }

 java {
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
    java
    `maven-publish`
-    id("io.papermc.paperweight.patcher") version "1.7.2-SNAPSHOT"
+    id("io.papermc.paperweight.patcher") version "1.7.3-SNAPSHOT"
 }

 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
@@ -16,7 +16,7 @@ repositories {
 }

 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
+    remapper("net.fabricmc:tiny-remapper:0.10.4:fat")
    decompiler("org.vineflower:vineflower:1.10.1")
    paperclip("cn.dreeam:quantumleaper:1.0.0-SNAPSHOT")
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 group = cn.dreeam.leaf
-mcVersion = 1.21
-version = 1.21-R0.1-SNAPSHOT
+mcVersion = 1.21.1
+version = 1.21.1-R0.1-SNAPSHOT

-galeCommit = 3a5ff7002573845a0684c05efc820bafd9a76d55
+galeCommit = f2ee091748ade732ccc2c147a80ee064f03cffbe

 org.gradle.caching = true
 org.gradle.parallel = true
--- a/patches/api/0004-Purpur-API-Changes.patch
+++ b/patches/api/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: 4e55e26f4dcd046f68c977b6348ad3ae265aa896
+Commit: abf2f2109bd550623a8b3e9d398995aa0185e70c

 Patches below are removed in this patch:
 Pufferfish-API-Changes.patch
--- a/patches/generated-api/0001-Purpur-generated-api-Changes.patch
+++ b/patches/generated-api/0001-Purpur-generated-api-Changes.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Purpur generated-api Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur

-Commit: 4e55e26f4dcd046f68c977b6348ad3ae265aa896
+Commit: abf2f2109bd550623a8b3e9d398995aa0185e70c

 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 3add91218dd3f07052aa932f0503d1f10ac3799b..3e41a4141095bce989c75e989293deb3f47e8e6d 100644
+index 02411466bdcf4ff731f01ccebb2c99942e0db878..2718c0e5061838b01881bb231c53f4da348adce3 100644
 --- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
@@ -436,6 +436,18 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -28,6 +28,6 @@ index 3add91218dd3f07052aa932f0503d1f10ac3799b..3e41a4141095bce989c75e989293deb3
 +    GoalKey<IronGolem> RECEIVE_FLOWER = GoalKey.of(IronGolem.class, NamespacedKey.minecraft("receive_flower"));
 +    // Purpur end
 +
-     private static <T extends Mob> @NotNull GoalKey<T> create(final @NotNull String key,
-             final @NotNull Class<T> type) {
+     private static <T extends Mob> @NonNull GoalKey<T> create(final @NonNull String key,
+             final @NonNull Class<T> type) {
         return GoalKey.of(type, NamespacedKey.minecraft(key));
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -188,6 +188,19 @@ index bdfb969f88e68d89a5cad4b145bbc1441a110bac..fba0558f46516f65c678635359f305f8
                 // We don't need to parse pending
                 // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
             }
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+index 394588a2ec825807bcf2d1383586a25f941dd774..62b7870072338ebc5adc62a1793136491d0288f5 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+@@ -487,7 +487,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+ 
+     @Override
+     public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
+-        return new org.galemc.gale.version.GaleVersionFetcher(); // Gale - branding changes - version fetcher
+        return new org.dreeam.leaf.version.LeafVersionFetcher(); // Gale - branding changes - version fetcher // Leaf
+     }
+ 
+     @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 index 0b5979723bb30f9011ac64c36d894aa41713ec9b..e220f5601f6b92b7b280ce8ebe64117d30192b0e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@@ -201,19 +214,29 @@ index 0b5979723bb30f9011ac64c36d894aa41713ec9b..e220f5601f6b92b7b280ce8ebe64117d
         Properties properties = new Properties();
 
         if (stream != null) {
-diff --git a/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java b/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java
-index 3d674eca7d20202d8f811c5c3e3946a12046028a..6fae3dedda0ce742e33040c7b85b5a596d9be76f 100644
--- a/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java
-+++ b/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java
-@@ -5,7 +5,7 @@ package org.galemc.gale.version;
- public class GaleVersionFetcher extends AbstractPaperVersionFetcher {
- 
-     public GaleVersionFetcher() {
-        super("ver/1.20.2", "https://github.com/GaleMC/Gale", "Gale", "GaleMC", "GaleMC", "Gale");
-+        super("ver/1.21", "https://github.com/Winds-Studio/Leaf", "Leaf", "Winds-Studio", "Winds-Studio", "Leaf"); // Leaf
-     }
- 
- }
+diff --git a/src/main/java/org/dreeam/leaf/version/LeafVersionFetcher.java b/src/main/java/org/dreeam/leaf/version/LeafVersionFetcher.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..051430b8dc96d22bfb05f725721dc7ab1766d851
+--- /dev/null
+++ b/src/main/java/org/dreeam/leaf/version/LeafVersionFetcher.java
+@@ -0,0 +1,17 @@
+package org.dreeam.leaf.version;
+
+import org.galemc.gale.version.AbstractPaperVersionFetcher;
+
+public class LeafVersionFetcher extends AbstractPaperVersionFetcher {
+
+    public LeafVersionFetcher() {
+        super(
+                "ver/1.21.1",
+                "https://github.com/Winds-Studio/Leaf",
+                "Leaf",
+                "Winds-Studio",
+                "Winds-Studio",
+                "Leaf"
+        );
+    }
+}
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
 index 08fa6018bcab38d8c9ca05c84e229d69184ce01b..f9351c15c8c6e2f4cbd2af0a15bdd5e1a90cb262 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
--- a/patches/server/0011-Purpur-Server-Changes.patch
+++ b/patches/server/0011-Purpur-Server-Changes.patch
@@ -8,7 +8,7 @@ TODO - Dreeam: Check Fix-pufferfish-issues.patch
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur

-Commit: 4e55e26f4dcd046f68c977b6348ad3ae265aa896
+Commit: 930003b1d1826c083f3cee4db79621e6a7d726f1

 Patches below are removed in this patch:
 Brand changes in Rebrand.patch
@@ -3087,11 +3087,11 @@ index 2ee48ac3b665db2b02bcb1a30ec972d43a3725b0..59e8f5431ce5026209e1428b5fa5b548
     }
     // Paper end - custom shear drops
 diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-index f9f6745d45aaba4a7106f80d403dcf9ae40e1d6c..80a8125dda7048cb37fbd4b8f56b59fcb4915b1d 100644
+index f8174dd45cef1c521a96a7bbda811630c438cb4a..14ceb3308474e76220bd64b0254df3f2925d4206 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-@@ -24,15 +24,23 @@ public class AttributeMap {
-     private final Set<AttributeInstance> attributesToUpdate = new ObjectOpenHashSet<>();
+@@ -26,15 +26,23 @@ public class AttributeMap {
+     // Gale end - Lithium - replace AI attributes with optimized collections
     private final AttributeSupplier supplier;
     private final java.util.function.Function<Holder<Attribute>, AttributeInstance> createInstance; // Gale - Airplane - reduce entity allocations
 +    private final net.minecraft.world.entity.LivingEntity entity; // Purpur
@@ -3115,7 +3115,7 @@ index f9f6745d45aaba4a7106f80d403dcf9ae40e1d6c..80a8125dda7048cb37fbd4b8f56b59fc
             this.attributesToSync.add(instance);
         }
     }
-@@ -46,7 +54,7 @@ public class AttributeMap {
+@@ -48,7 +56,7 @@ public class AttributeMap {
     }
 
     public Collection<AttributeInstance> getSyncableAttributes() {
@@ -16131,10 +16131,10 @@ index f933fa419a4b55b0096ff42caf1b071d027b8e7e..a9cff34c85e1907bcbca2b0512897814
         private int ticksInHive;
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index c0563260277f9f4bd9ff08993b2efb4bca9a0c60..cd0e43f4c53a746dd6183a8406269f9b11ad3571 100644
+index 7dfabb11d3c8112f6daef35d204a2e324f4ddb5e..a7b6c20afd9ec3fe61d2bdf42f96398c8d6751cc 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -87,6 +87,12 @@ public abstract class BlockEntity {
+@@ -100,6 +100,12 @@ public abstract class BlockEntity {
         if (persistentDataTag instanceof CompoundTag) {
             this.persistentDataContainer.putAll((CompoundTag) persistentDataTag);
         }
@@ -16147,7 +16147,7 @@ index c0563260277f9f4bd9ff08993b2efb4bca9a0c60..cd0e43f4c53a746dd6183a8406269f9b
     }
     // CraftBukkit end
 
-@@ -103,6 +109,15 @@ public abstract class BlockEntity {
+@@ -116,6 +122,15 @@ public abstract class BlockEntity {
         this.loadAdditional(nbt, registryLookup);
     }
 
@@ -16163,7 +16163,7 @@ index c0563260277f9f4bd9ff08993b2efb4bca9a0c60..cd0e43f4c53a746dd6183a8406269f9b
     protected void saveAdditional(CompoundTag nbt, HolderLookup.Provider registryLookup) {}
 
     public final CompoundTag saveWithFullMetadata(HolderLookup.Provider registryLookup) {
-@@ -407,4 +422,16 @@ public abstract class BlockEntity {
+@@ -423,4 +438,16 @@ public abstract class BlockEntity {
 
         <T> T getOrDefault(DataComponentType<? extends T> type, T fallback);
     }
@@ -16857,7 +16857,7 @@ index 9d93130f23addb18b97d7f5ec013faef17a74529..29d2fb87a65778926aea2cfc7a5b486c
 +    // Purpur end - OfflinePlayer API
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 87023666f2e6dbfa431a50f612fa1b2c16f5e000..c19abc00c723da5da63939a2374c5d71b8e794fc 100644
+index 22c76d7301037617ff56da3aedd07a0b36aab290..d4fe9164831bb1e066926e3bdecf2c15ec44fa10 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -415,6 +415,20 @@ public final class CraftServer implements Server {
--- a/patches/server/0015-Remove-Timings.patch
+++ b/patches/server/0015-Remove-Timings.patch
@@ -1577,7 +1577,7 @@ index d9afbfb23536e180e2af5658de0bd1d4673f4251..64f96850cad67c64c9c71b2c5d1cc68d
     @Nullable
     private String descriptionId;
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index cd0e43f4c53a746dd6183a8406269f9b11ad3571..54657ac895fb2fa9c58910d5421f0082d140cfed 100644
+index a7b6c20afd9ec3fe61d2bdf42f96398c8d6751cc..73c9f91457683e8e6bd8293b4393ccbd984eddb7 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
@@ -33,14 +33,9 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry;
@@ -1596,10 +1596,10 @@ index cd0e43f4c53a746dd6183a8406269f9b11ad3571..54657ac895fb2fa9c58910d5421f0082
     private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
     public CraftPersistentDataContainer persistentDataContainer;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 83ba2e128fb72f786675d1eea709be3e3a319e80..6f8c1dc641c870e2d3077c909a56b10cbc6dbed9 100644
+index 4aa33233060b2b2bd809d92d35bd0933cb015d41..5ad94cabbab741d69363d40df359075da7165c97 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -669,7 +669,6 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -674,7 +674,6 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
             ((ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel)this.level).moonrise$getChunkTaskScheduler().chunkHolderManager.getChunkHolder(this.locX, this.locZ).getEntityChunk().callEntitiesLoadEvent(); // Paper - rewrite chunk system
 
             if (this.needsDecoration) {
@@ -1607,7 +1607,7 @@ index 83ba2e128fb72f786675d1eea709be3e3a319e80..6f8c1dc641c870e2d3077c909a56b10c
                 this.needsDecoration = false;
                 java.util.Random random = new java.util.Random();
                 random.setSeed(this.level.getSeed());
-@@ -689,7 +688,6 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -694,7 +693,6 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
                     }
                 }
                 server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkPopulateEvent(bukkitChunk));
@@ -1615,7 +1615,7 @@ index 83ba2e128fb72f786675d1eea709be3e3a319e80..6f8c1dc641c870e2d3077c909a56b10c
             }
         }
     }
-@@ -1026,7 +1024,6 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -1031,7 +1029,6 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
 
                 if (LevelChunk.this.isTicking(blockposition)) {
                     try {
@@ -1623,7 +1623,7 @@ index 83ba2e128fb72f786675d1eea709be3e3a319e80..6f8c1dc641c870e2d3077c909a56b10c
                         BlockState iblockdata = LevelChunk.this.getBlockState(blockposition);
 
                         if (this.blockEntity.getType().isValid(iblockdata)) {
-@@ -1049,14 +1046,9 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -1054,14 +1051,9 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
                         net.minecraft.world.level.chunk.LevelChunk.this.level.getCraftServer().getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerInternalException(msg, throwable))); // Paper - ServerExceptionEvent
                         LevelChunk.this.removeBlockEntity(this.getPos());
                         // Paper end - Prevent block entity and entity crashes
@@ -1639,7 +1639,7 @@ index 83ba2e128fb72f786675d1eea709be3e3a319e80..6f8c1dc641c870e2d3077c909a56b10c
 
         @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c19abc00c723da5da63939a2374c5d71b8e794fc..0eba5c69b36416dab175b73ada52a738700cdc3b 100644
+index d4fe9164831bb1e066926e3bdecf2c15ec44fa10..ea78041ea6fa87f8c810d05188a89829ce301647 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -478,7 +478,6 @@ public final class CraftServer implements Server {
@@ -1789,7 +1789,7 @@ index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..e9798517b9211c50a20ea5c69603aab3
     }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 51e30d84080c8d32138217e0e8eda181f7f737db..024dc051986ebb9d83f4bf9b020b586f6219f6b0 100644
+index 62b7870072338ebc5adc62a1793136491d0288f5..55433c8956e5e10cb156c8a8b572e80b3b0c14ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -199,9 +199,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
--- a/patches/server/0040-Petal-Async-Pathfinding.patch
+++ b/patches/server/0040-Petal-Async-Pathfinding.patch
@@ -628,10 +628,10 @@ index f929b9e623eaea0e949a7af1828b9eb198fc66b8..1e31f20da2450e92228d511f060ff9f5
                     @Override
                     protected float distance(Node a, Node b) {
 diff --git a/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
-index 40518b1a58494525223e47845b4cb57c92a22d5e..49b6fb883c3eba80bca73bbd716814b2b71668fd 100644
+index d85da0661096a3587917c6636728bfd2e3eb90a2..092c518b86184bc33c6616ab6dffec3f5f88ce97 100644
 --- a/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
-@@ -215,8 +215,15 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
+@@ -214,8 +214,15 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
 
     @Override
     protected VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) {
--- a/patches/server/0041-Petal-reduce-work-done-by-game-event-system.patch
+++ b/patches/server/0041-Petal-reduce-work-done-by-game-event-system.patch
@@ -38,7 +38,7 @@ index a74732902c0494c67e6acf2fc04581ff9c46b832..8b60c922750e71f526976782a1f156e9
             LivingEntity entityliving1 = deadEntity.getLastHurtByMob();
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 070e7b5db06bd670f97ac7f25767be1d33c5d02e..4e3da128942262a6b0230c0ffaad191112e9ec25 100644
+index 5ad94cabbab741d69363d40df359075da7165c97..308fde6ec1df5dce8e6c323f0cb07a99451a086e 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -81,7 +81,18 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
@@ -97,7 +97,7 @@ index 070e7b5db06bd670f97ac7f25767be1d33c5d02e..4e3da128942262a6b0230c0ffaad1911
         } else {
             return super.getListenerRegistry(ySectionCoord);
         }
-@@ -630,7 +655,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+@@ -635,7 +660,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
     }
 
     private void removeGameEventListenerRegistry(int ySectionCoord) {