Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e3042d2 Fix the growth modifier for glowberries (#7986)
PaperMC/Paper@805423c Add ARMOR tag to MaterialTags (1.19) (#7987)
PaperMC/Paper@4a48ed3 Add option for strict advancement dimension checks (#7954)
PaperMC/Paper@17c1c6c Add missing important BlockStateListPopulator methods (#7952)
PaperMC/Paper@94ef34c Fix incorrect ansi code being used for bold (#8000)
PaperMC/Paper@2dcfb2b Nameable Banner API (#7711)
This commit is contained in:
Lexi
2022-06-16 12:56:45 -04:00
parent c9e7de5daf
commit cf3ebd68d4
2 changed files with 3 additions and 3 deletions

View File

@@ -2,7 +2,7 @@ group = gg.projecteden.parchment
version = 1.19-R0.1-SNAPSHOT version = 1.19-R0.1-SNAPSHOT
mcVersion = 1.19 mcVersion = 1.19
paperRef = 48f7a1a9ef14511efb341c145c664a5a47f1f595 paperRef = 2dcfb2b11fb0ef9807d01c81e891d90b74ba4750
org.gradle.caching=true org.gradle.caching=true
org.gradle.parallel=true org.gradle.parallel=true

View File

@@ -123,10 +123,10 @@ index 0dc7a827aeacc7fae53b1f975f45883da7db6a0c..782be663520c27fccb58484ec56cc94d
@Override @Override
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index c8057f98e16ba6e19640e0b250e5201e0f4f57db..f2048fe46e0231e877d4e61f30387406fef82d51 100644 index 353463084d90eb684717e65c56da52cd25a1e375..e7fb384822966c149777148792723f7f36681f76 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2221,7 +2221,19 @@ public class ServerPlayer extends Player { @@ -2227,7 +2227,19 @@ public class ServerPlayer extends Player {
@Override @Override
public void playNotifySound(SoundEvent event, SoundSource category, float volume, float pitch) { public void playNotifySound(SoundEvent event, SoundSource category, float volume, float pitch) {