From 5bf09622eede87f7654ea5ec34046832a4cd0afb Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Thu, 21 Mar 2024 20:12:38 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@09d6dfb [ci skip] Upstream dependencies in workflow scripts. (#10338)
PaperMC/Paper@55ffcb1 Fix tripwire disarming not working as intended
PaperMC/Paper@05fe15e Fire EntityChangeBlockEvent on beehive nectar deposit (#10306)
PaperMC/Paper@de620b8 Clone mutable types in events when changes are discarded (#10333)
PaperMC/Paper@41ffa0c Expose power on fireballs (#10302)
PaperMC/Paper@88419b2 Do not copy profile data if profiles are the same (#10259)
---
 .github/workflows/build.yml              | 7 ++++---
 gradle.properties                        | 2 +-
 patches/server/0295-Stored-Bee-API.patch | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9399b666c..4312154a3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,13 +11,14 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.commits[0].message, '[ci-skip]')"
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
-      - uses: actions/setup-java@v3.6.0
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 17
           cache: 'gradle'
+      - uses: gradle/wrapper-validation-action@v2
+      - uses: gradle/actions/setup-gradle@v3
       - name: Configure Git
         run: git config --global user.email "no-reply@github.com" && git config --global user.name "Github Actions"
       - name: Apply Patches
diff --git a/gradle.properties b/gradle.properties
index a574b144c..9bf0bf8aa 100644
--- 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 = 99a641690abd3d3669249ce10243e0739a13af33
+paperCommit = 88419b207579533646ab011da886030ea9ea4862
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0295-Stored-Bee-API.patch b/patches/server/0295-Stored-Bee-API.patch
index 8fd770b33..fcce78557 100644
--- a/patches/server/0295-Stored-Bee-API.patch
+++ b/patches/server/0295-Stored-Bee-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Stored Bee API
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index dc5bcf8f7662bd1feb4375605f27c320878bf7e0..7810d763841825f68c60b7471026d71d89726bf0 100644
+index ba610e05806ad020d439d59d30b820bc9cd3fbff..6afaab31539667667481f7e9bfc0c6846abe661a 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -134,6 +134,22 @@ public class BeehiveBlockEntity extends BlockEntity {
@@ -44,7 +44,7 @@ index dc5bcf8f7662bd1feb4375605f27c320878bf7e0..7810d763841825f68c60b7471026d71d
      // Paper start - Add EntityBlockStorage clearEntities
      public void clearBees() {
          this.stored.clear();
-@@ -429,9 +451,9 @@ public class BeehiveBlockEntity extends BlockEntity {
+@@ -435,9 +457,9 @@ public class BeehiveBlockEntity extends BlockEntity {
          private BeeReleaseStatus() {}
      }