From cf3ebd68d41e9545952e6374d674b794dfb7e026 Mon Sep 17 00:00:00 2001
From: Lexi <lexi@qixils.dev>
Date: Thu, 16 Jun 2022 12:56:45 -0400
Subject: [PATCH] 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)
---
 gradle.properties                        | 2 +-
 patches/server/0003-Add-SoundEvent.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index eaa67ef..c8f2c1d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = gg.projecteden.parchment
 version = 1.19-R0.1-SNAPSHOT
 
 mcVersion = 1.19
-paperRef = 48f7a1a9ef14511efb341c145c664a5a47f1f595
+paperRef = 2dcfb2b11fb0ef9807d01c81e891d90b74ba4750
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/server/0003-Add-SoundEvent.patch b/patches/server/0003-Add-SoundEvent.patch
index e559bf6..6b7b428 100644
--- a/patches/server/0003-Add-SoundEvent.patch
+++ b/patches/server/0003-Add-SoundEvent.patch
@@ -123,10 +123,10 @@ index 0dc7a827aeacc7fae53b1f975f45883da7db6a0c..782be663520c27fccb58484ec56cc94d
  
      @Override
 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
 +++ 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
      public void playNotifySound(SoundEvent event, SoundSource category, float volume, float pitch) {