From 666c7eac20edd2f715518ce4c0dfee61bb83c05e Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Jun 2021 12:48:05 -0500
Subject: [PATCH] update paper

---
 gradle.properties                               |  2 +-
 patches/server/0001-Rebrand.patch               | 10 +++++-----
 patches/server/0115-Infinite-fuel-furnace.patch |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 720aa3cbe..48a347dbe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group=net.pl3x.purpur
 version=1.17-R0.1-SNAPSHOT
 packageVersion=1_17_R1
-paperCommit=7f82b50636a94e9daed26436acafa8e33f37b1f2
+paperCommit=ac95f25f3534d0c5e65ea7d106973639a58670a1
 
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx3G
diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index aa14a6f43..8ccc0149c 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 03521590dfcbb09416097e793fae5951c1ae3cc0..ab116b119193143757ab3f27f96e9f9ce4ba8165 100644
+index 04938bb10c35d2e424043adb7ed8fec2e42bb816..4bcd8f006c94a82970be91cc58583b2261270567 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -18,8 +18,8 @@ repositories {
@@ -25,9 +25,9 @@ index 03521590dfcbb09416097e793fae5951c1ae3cc0..ab116b119193143757ab3f27f96e9f9c
      implementation("io.netty:netty-all:4.1.65.Final") // Paper
 +    implementation("cat.inspiracio:rhino-js-engine:1.7.7.1") // Purpur
  
-     testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
-     testImplementation("junit:junit:4.13.1")
-@@ -64,7 +65,7 @@ tasks.jar {
+     implementation("com.github.oshi:oshi-core:5.7.5") // Paper - fix startup delay and warning
+ 
+@@ -66,7 +67,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -36,7 +36,7 @@ index 03521590dfcbb09416097e793fae5951c1ae3cc0..ab116b119193143757ab3f27f96e9f9c
              "Implementation-Vendor" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Date()), // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -120,7 +121,7 @@ tasks.test {
+@@ -122,7 +123,7 @@ tasks.test {
  fun TaskContainer.registerRunTask(
      name: String, block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
diff --git a/patches/server/0115-Infinite-fuel-furnace.patch b/patches/server/0115-Infinite-fuel-furnace.patch
index e8bb72c75..a10835bee 100644
--- a/patches/server/0115-Infinite-fuel-furnace.patch
+++ b/patches/server/0115-Infinite-fuel-furnace.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Infinite fuel furnace
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index de53c9652fd6103c4ee5bdb9304979b675cb2bd7..ad281f15ff8fca4770b6a8c3bb81964a835f7f4f 100644
+index c559ec5041474e585e4d95a664c84e1fa895cf16..806277d029a1c1a2d334a05d94163415c2619b8d 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -40,6 +40,7 @@ import net.minecraft.world.level.Level;
@@ -16,7 +16,7 @@ index de53c9652fd6103c4ee5bdb9304979b675cb2bd7..ad281f15ff8fca4770b6a8c3bb81964a
  import net.minecraft.world.phys.Vec3;
  // CraftBukkit start
  import org.bukkit.craftbukkit.block.CraftBlock;
-@@ -316,6 +317,22 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+@@ -317,6 +318,22 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
  
          ItemStack itemstack = (ItemStack) blockEntity.items.get(1);
  
@@ -39,7 +39,7 @@ index de53c9652fd6103c4ee5bdb9304979b675cb2bd7..ad281f15ff8fca4770b6a8c3bb81964a
          if (!blockEntity.isLit() && (itemstack.isEmpty() || ((ItemStack) blockEntity.items.get(0)).isEmpty())) {
              if (!blockEntity.isLit() && blockEntity.cookingProgress > 0) {
                  blockEntity.cookingProgress = Mth.clamp(blockEntity.cookingProgress - 2, 0, blockEntity.cookingTotalTime);
-@@ -379,6 +396,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+@@ -380,6 +397,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
              setChanged(world, pos, state);
          }