Skip to content

Commit

Permalink
Updated Upstream (Paper/Gale)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@0e82527 Fix NPE while trying to respawn an already disconnected player (#11353)
PaperMC/Paper@5d91bef Fix shulkerbox loot table replenish (#11366)
PaperMC/Paper@a8e6a93 Deprecate for removal all OldEnum-related methods (#11371)
PaperMC/Paper@925c3b9 Add FeatureFlag API (#8952)
PaperMC/Paper@426f992 Enchantment is data-driven, so not FeatureDependant (#11377)
PaperMC/Paper@1ba1be7 Update Velocity natives again
PaperMC/Paper@7632de5 Tag Lifecycle Events (#10993)
PaperMC/Paper@b09eaf2 Add Item serialization as json api (#11235)
PaperMC/Paper@971a7a5 Add Decorated Pot Cracked API (#11365)
PaperMC/Paper@61fe23c deprecate isEnabledByFeature in Item/BlockType
PaperMC/Paper@e945cfe Fix PaperServerListPingEvent#getPlayerSample not being populated or used (#11387)

Gale Changes:
Dreeam-qwq/Gale@5b2f4f7 Updated Upstream (Paper)
Dreeam-qwq/Gale@e33d83d Remove vanilla profiler in tag lifecycle event
  • Loading branch information
Dreeam-qwq committed Sep 12, 2024
1 parent c5edeac commit c28b3da
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = cn.dreeam.leaf
mcVersion = 1.21.1
version = 1.21.1-R0.1-SNAPSHOT

galeCommit = de9e80495b291819a9838681291bb3af148395da
galeCommit = e33d83d9eb4aa92f42f5d301e829886773e28e17

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
5 changes: 2 additions & 3 deletions patches/server/0016-Bump-Dependencies.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Subject: [PATCH] Bump Dependencies
TODO - Dreeam: Bump & test dependencies, impl new features?

diff --git a/build.gradle.kts b/build.gradle.kts
index 6434e3d96af137bf398fff66225dfcda79f513db..0f764c0ac16fedf88bec23ea97021a218932b148 100644
index 89e288e3704b5f70a64411eba6f76b01cee7a1b5..e513b77dca167d38fe2210f5bb431e8d59057552 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
Expand Down Expand Up @@ -45,8 +45,7 @@ index 6434e3d96af137bf398fff66225dfcda79f513db..0f764c0ac16fedf88bec23ea97021a21
+ runtimeOnly("com.mysql:mysql-connector-j:8.4.0") // Dreeam TODO - Update to 9.0.0
+ runtimeOnly("com.lmax:disruptor:3.4.4") // Paper // Leaf - Bump Dependencies // Dreeam TODO - Waiting Log4j 3.x to support disruptor 4.0.0
// Paper start - Use Velocity cipher
- implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
+ implementation("com.velocitypowered:velocity-native:3.3.0-SNAPSHOT") { // Leaf - Bump Dependencies
implementation("com.velocitypowered:velocity-native:3.3.0-SNAPSHOT") {
isTransitive = false
}
// Paper end - Use Velocity cipher
Expand Down

0 comments on commit c28b3da

Please sign in to comment.