From e0a4fe24cf02b7aea50f41da9af8bd559beca21b Mon Sep 17 00:00:00 2001
From: lexikiq <noellekiq@gmail.com>
Date: Mon, 21 Jun 2021 02:34:12 -0400
Subject: [PATCH] Update upstream

---
 gradle.properties                                   | 2 +-
 patches/server/0002-Add-SoundEvent.patch            | 4 ++--
 patches/server/0008-Add-Player-setGameProfile.patch | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 8238962..66b6091 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ version = 1.17-R0.1-SNAPSHOT
 
 mcVersion = 1.17
 packageVersion = 1_17_R1
-paperRef = 321ddfea3c18d17e01c571f1504eaeb2e693e053
+paperRef = 1830de58bf19ae47b13f7929c9012dc4b6674fd2
diff --git a/patches/server/0002-Add-SoundEvent.patch b/patches/server/0002-Add-SoundEvent.patch
index bf8c526..59040c8 100644
--- a/patches/server/0002-Add-SoundEvent.patch
+++ b/patches/server/0002-Add-SoundEvent.patch
@@ -79,7 +79,7 @@ index a6ecbb7eb1df7923d58366327e0f00512a3a1677..43dc36e6da0b044279021ef48bed29a9
          }
          // Added from changeDimension
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d286d88a3c3f93dbfa92de9421e320c92cd96350..eea377ccf09afd2c175041bdd8226e1009fe6914 100644
+index 1bccd932851045c374e3092d33dc77fab680d0db..855a25c1a788039ac0d0ac340fd2b0e0064ce816 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -30,7 +30,7 @@ import net.minecraft.network.chat.MutableComponent;
@@ -91,7 +91,7 @@ index d286d88a3c3f93dbfa92de9421e320c92cd96350..eea377ccf09afd2c175041bdd8226e10
  import net.minecraft.network.syncher.EntityDataAccessor;
  import net.minecraft.network.syncher.EntityDataSerializers;
  import net.minecraft.network.syncher.SynchedEntityData;
-@@ -1824,7 +1824,7 @@ public abstract class Player extends LivingEntity {
+@@ -1829,7 +1829,7 @@ public abstract class Player extends LivingEntity {
      private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
          fromEntity.level.playSound(fromEntity, x, y, z, soundEffect, soundCategory, volume, pitch); // This will not send the effect to the entity himself
          if (fromEntity instanceof ServerPlayer) {
diff --git a/patches/server/0008-Add-Player-setGameProfile.patch b/patches/server/0008-Add-Player-setGameProfile.patch
index 05f6533..9d786b2 100644
--- a/patches/server/0008-Add-Player-setGameProfile.patch
+++ b/patches/server/0008-Add-Player-setGameProfile.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#setGameProfile
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index eea377ccf09afd2c175041bdd8226e1009fe6914..b5b6102bd1f841157f258d79d02a7d2ca90ba200 100644
+index 855a25c1a788039ac0d0ac340fd2b0e0064ce816..c3283f471ffde214b6d771a2df554697e57ba124 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1443,6 +1443,12 @@ public abstract class Player extends LivingEntity {
+@@ -1448,6 +1448,12 @@ public abstract class Player extends LivingEntity {
          return this.gameProfile;
      }