From 1a5f02ce1bcb29183f576c02d8f85b1fab46c587 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Fri, 8 Oct 2021 22:39:53 -0700
Subject: [PATCH] Update upstream

---
 gradle.properties                       |  2 +-
 patches/server/0001-Build-changes.patch | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index eb32053..0ad9c4e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=com.example.paperfork
 version=1.17.1-R0.1-SNAPSHOT
 
 mcVersion=1.17.1
-paperRef=e39159134f3f52142a06f37a389a00c9ce3e724e
+paperRef=a61827df9109522f4e84cbe312f6185ba9d7a254
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index ea03d20..f37e6cc 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index d80cfcb94db51440b5d0aa589a9a3d8a4189a9aa..ed6139b1a8d8c814fde6c1b2fd7db425720908b6 100644
+index cb1a931417073908be5c7aa1af710477775b3dbd..93675c95d0a798988652b4c6e8010ebad28e12c7 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -29,8 +29,8 @@ repositories {
+@@ -28,8 +28,8 @@ repositories {
  }
  
  dependencies {
@@ -19,7 +19,7 @@ index d80cfcb94db51440b5d0aa589a9a3d8a4189a9aa..ed6139b1a8d8c814fde6c1b2fd7db425
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.12.1")
      implementation("net.minecrell:terminalconsoleappender:1.2.0")
-@@ -82,7 +82,7 @@ tasks.jar {
+@@ -81,7 +81,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -28,7 +28,7 @@ index d80cfcb94db51440b5d0aa589a9a3d8a4189a9aa..ed6139b1a8d8c814fde6c1b2fd7db425
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -207,7 +207,7 @@ tasks.test {
+@@ -206,7 +206,7 @@ tasks.test {
  fun TaskContainer.registerRunTask(
      name: String, block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -38,7 +38,7 @@ index d80cfcb94db51440b5d0aa589a9a3d8a4189a9aa..ed6139b1a8d8c814fde6c1b2fd7db425
      workingDir = rootProject.layout.projectDirectory.dir(
          providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run")
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fe6d5051b139cd6079e288ffdf20e30fdd46fdda..c0712fde9b41a24166224c188b82d022de56a24a 100644
+index c8876b000a03f18e7a140167ed4505a9843a8d14..45157114dcfa2da5c379d1593d0a54e1a370b288 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -51,10 +51,10 @@ index fe6d5051b139cd6079e288ffdf20e30fdd46fdda..c0712fde9b41a24166224c188b82d022
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f925130552cb4ff2f813b1ddae9ac2f915e17bd5..33f99ff667b60b98502d073f5a224e38d81d74c2 100644
+index 0adb686d690e1be0c5540625efbecc46bac5d045..c409d5c2fc45786e8629df608feff444dcfaa265 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper
+@@ -251,7 +251,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {