Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
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)
This commit is contained in:
granny
2024-03-21 20:12:38 -07:00
parent 943f9af80b
commit 5bf09622ee
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build.yml vendored
View File

@@ -11,13 +11,14 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: "!contains(github.event.commits[0].message, '[ci-skip]')" if: "!contains(github.event.commits[0].message, '[ci-skip]')"
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v1 - uses: actions/setup-java@v4
- uses: actions/setup-java@v3.6.0
with: with:
distribution: temurin distribution: temurin
java-version: 17 java-version: 17
cache: 'gradle' cache: 'gradle'
- uses: gradle/wrapper-validation-action@v2
- uses: gradle/actions/setup-gradle@v3
- name: Configure Git - name: Configure Git
run: git config --global user.email "no-reply@github.com" && git config --global user.name "Github Actions" run: git config --global user.email "no-reply@github.com" && git config --global user.name "Github Actions"
- name: Apply Patches - name: Apply Patches

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.20.4-R0.1-SNAPSHOT version = 1.20.4-R0.1-SNAPSHOT
mcVersion = 1.20.4 mcVersion = 1.20.4
paperCommit = 99a641690abd3d3669249ce10243e0739a13af33 paperCommit = 88419b207579533646ab011da886030ea9ea4862
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

4
patches/server/0295-Stored-Bee-API.patch
View File

@@ -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 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 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+++ b/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 { @@ -134,6 +134,22 @@ public class BeehiveBlockEntity extends BlockEntity {
@@ -44,7 +44,7 @@ index dc5bcf8f7662bd1feb4375605f27c320878bf7e0..7810d763841825f68c60b7471026d71d
// Paper start - Add EntityBlockStorage clearEntities // Paper start - Add EntityBlockStorage clearEntities
public void clearBees() { public void clearBees() {
this.stored.clear(); this.stored.clear();
@@ -429,9 +451,9 @@ public class BeehiveBlockEntity extends BlockEntity { @@ -435,9 +457,9 @@ public class BeehiveBlockEntity extends BlockEntity {
private BeeReleaseStatus() {} private BeeReleaseStatus() {}
} }